1
0
mirror of https://github.com/ceph/ceph synced 2024-12-24 04:14:07 +00:00
Commit Graph

53652 Commits

Author SHA1 Message Date
songbaisen
750705aca6 doc: fix the librados c api can not compile problem
Signed-off-by:song baisen <song.baisen@zte.com.cn>
2016-05-30 19:32:57 +08:00
Matt Benjamin
45a15914c2 Merge branch 'xio-rename_XioRsp' of https://github.com/Adirl/ceph into Adirl-xio-rename_XioRsp
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-05-23 19:00:03 -04:00
Josh Durgin
ca9d87d969 Merge pull request from athanatos/wip-throttle
BackoffThrottle: fix for freebsd and avoid spinning when full

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-23 15:02:41 -07:00
Matt Benjamin
1f03205e8b Merge pull request from linuxbox2/xio-enqueue-2
xio: follow 03d33e59 (enqueue_for_send()->enqueue())
2016-05-23 17:24:17 -04:00
Matt Benjamin
e882f7925e xio: follow 03d33e59 (enqueue_for_send()->enqueue())
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-05-23 17:22:38 -04:00
Gregory Farnum
94dfdcdda7 Merge pull request from ktdreyer/wip-doc-cephfs-jcsp
doc: John Spray is now CephFS lead

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-23 14:21:33 -07:00
Ken Dreyer
b7b1ecb4d8 doc: John Spray is now CephFS lead
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-23 15:18:10 -06:00
Matt Benjamin
63c74d5f7e Merge pull request from avnerbh/fixes_4_keepalive_to_xio
xio: provide keepalive(s) and their ack(s)
2016-05-23 17:12:45 -04:00
Casey Bodley
f3a473ca00 Merge pull request from weiqiaomiao/wqm-wip-rgw-mem
rgw: fix some memory leak

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 16:55:15 -04:00
Matt Benjamin
052e639420 Merge pull request from roidayan/xio-use_xio_session_event_str
xio: use accelio api to get event str

(this is a decision for the Accelio API, we need to follow it)
2016-05-23 16:26:39 -04:00
Matt Benjamin
ffa2338f4a Merge pull request from Adirl/fix_compiltaion_entity_addr_t3
Fix compiltaion entity addr t
2016-05-23 16:24:34 -04:00
Casey Bodley
2fcb7b91e5 Merge pull request from oritwas/wip-15937
rgw: add missing metadata_heap pool to old zones

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 16:07:09 -04:00
Samuel Just
6f835726a7 BackoffThrottle: wait() if past max
Otherwise, we risk spinning on wait_for() with a small
delay.

Fixes: http://tracker.ceph.com/issues/15953
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:15 -07:00
Samuel Just
846808ff3f BackoffThrottle: use wait_for instead of wait_until
On some platforms, wait_until won't surrender the lock
with a negative argument.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:14 -07:00
Casey Bodley
0120d271bd Merge pull request from tchaikov/wip-cmake-ocf
cmake: add ocf support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 10:53:15 -04:00
Boris Ranto
bdd85cd4fe Merge pull request from ceph/rpm-autosetup-kdreyer
ceph.spec.in: use %autosetup macro

Reviewed-by: Nathan Cuthler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-05-23 16:34:42 +02:00
Kefu Chai
4711fe1cae Merge pull request from flaf/master
doc: update required packages list to build doc

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 22:20:54 +08:00
Sage Weil
23d329f5a6 Merge pull request from cxwshawn/wip-tc4-fix
global: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:51:27 -04:00
Sage Weil
7f1049d1d7 Merge pull request from cxwshawn/wip-tc5-fix
client: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:50:50 -04:00
Sage Weil
d8efaa117f osd/HitSet.h: add 'override' to virtual functionsReviewed-by: Kefu Chai <kchai@redhat.com>
osd/HitSet.h: add 'override' to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 09:50:13 -04:00
Sage Weil
b8e73de44c Merge pull request from yuyuyu101/wip-test-msgr-fix
test_msgr: add verbose info for pending connections

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:48:56 -04:00
John Spray
cb1c6fe26c Merge pull request from ajarr/wip-15614
ceph_volume_client: allow read-only authorization for volumes

Reviewed-by: John Spray <john.spray@redhat.com>
2016-05-23 12:34:30 +01:00
Ramana Raja
011ea5e7fb ceph_volume_client: allow read-only authorization for volumes
Allow clients to be restricted to read-only mount of the volume
by restricting their ceph auth ID's MDS and OSD caps to read-only.

Fixes: http://tracker.ceph.com/issues/15614

Signed-off-by: Ramana Raja <rraja@redhat.com>
2016-05-23 14:20:24 +05:30
Jason Dillaman
21c759936d Merge pull request from rjfd/wip-14421
rbd-mirror: Delete local image mirror when remote image mirroring is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 16:14:18 -04:00
Ricardo Dias
d85e312ead rbd-mirror: test: added image-deleter test case when mirroring is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
9cb0b180bc rbd-mirror: Unregister clients from non-primary images journal
A non-primary image may have registered clients on its journal
(for instance a primary image that was later demoted). We must
unregister the clients when disabling image mirroring with the
force option.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
ac9514941b rbd-mirror: test: Added unit test for testing image-deleter thread
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
e3677f115e rbd-mirror: test: Fixed test_PoolWatcher to support the new changes in PoolWatcher class
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
3c2615aa6d rbd-mirror: Replayer: bootstrap existing mirrored images
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
a6d698829d rbd-mirror: replayer: Added image-deleter thread to replayer
Fixes: http://tracker.ceph.com/issues/14421

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Ricardo Dias
011984d40b rbd-mirror: Added image-deleter thread to rbd-mirror
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Ricardo Dias
6cc6e663ed rbd-mirror: Added implementation of image-deleter thread
image-deleter thread will handle the deletion of local images that have
been disabled for mirroring by the primary site.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Jason Dillaman
1ac39355fd Merge pull request from vshankar/rbd-min-commit-position
cls_journal: initialize empty commit position upon client register

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 15:45:11 -04:00
Jason Dillaman
2f48747cdd Merge pull request from yuyuyu101/wip-13938
TaskFinisher: use singleton SafeTimer and Finisher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 15:44:53 -04:00
Haomai Wang
39515b0f7c test_msgr: add verbose info for pending connections
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-05-22 23:53:05 +08:00
cxwshawn
d2dfe8b607 client: optimize header file dependency.
same work as https://github.com/ceph/ceph/pull/9247

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2016-05-22 15:04:48 +08:00
Michal Jarzabek
c5582ec6be osd/HitSet.h: add 'override' to virtual functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-21 22:26:01 +01:00
Sage Weil
4764b699d6 osdc/Objecter: move C_TwoContexts class to cc fileReviewed-by: Sage Weil <sage@redhat.com>
osdc/Objecter: move C_TwoContexts class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-21 16:29:39 -04:00
Michal Jarzabek
43af3432f5 osdc/Objecter: move C_TwoContexts class to cc file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-21 15:48:18 +01:00
Kefu Chai
a78b9390de cmake: add ocf support
a new option is added: WITH_OCF. it is OFF by default.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-21 21:26:57 +08:00
chenxiaowei
4adf35d6fc global: optimize header file dependency.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2016-05-21 04:48:39 +01:00
Samuel Just
dc88e41062 Merge pull request from ceph/wip-fix-q-tests
common/: fix tests for prioritized_queue and wpq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-20 15:32:09 -07:00
Yehuda Sadeh
be22ac6540 Merge pull request from yehudasa/wip-rgw-leak-4
rgw: don't unregister request if request is not connected to manager

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-20 15:30:44 -07:00
Samuel Just
630dd27229 common/: fix tests for prioritized_queue and wpq
Introduced: 27b6ec40b9
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-20 15:22:56 -07:00
Sage Weil
15a479fbb4 Merge pull request from dzafman/wip-test-fix
test: Disable tests due to recovery race
2016-05-20 14:06:05 -04:00
David Zafman
5bc55338f5 test: Disable tests due to recovery race
Disable:
osd-scrub-repair.sh
test-erasure-eio.sh
test-erasure-code.sh

These test are failing due to race conditions that is exposing
bug http://tracker.ceph.com/issues/13937.

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-20 10:56:35 -07:00
Mykola Golub
17b1c91774 Merge pull request from dillaman/wip-15938
librbd: write-after-write might result in an inconsistent replicated image

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-05-20 20:52:42 +03:00
Sage Weil
27b6ec40b9 Merge pull request from athanatos/wip-recovery-wq
osd: Put background recovery tasks in the main OpWQ

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-20 13:26:02 -04:00
Sage Weil
c2d802eb29 Merge pull request from liewegas/wip-alloc-hints
librados,osd: rados hints for future access pattern

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-20 13:00:09 -04:00
Sage Weil
8d7200c978 Merge pull request from majianpeng/headerbeatmap-check
common/HeartbeatMap: print stack info of unhealth thread.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-20 12:59:35 -04:00