Commit Graph

51073 Commits

Author SHA1 Message Date
Mykola Golub
8e41220d34 test: fixup and improvements for rbd-mirror test
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-15 10:18:33 +02:00
Kefu Chai
5e82bb26b0 Merge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api
doc/rados/api/librados-intro.rst: fix typo

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2016-03-15 14:44:24 +08:00
xie xingguo
01db964f4e doc: fix typo
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-15 14:38:05 +08:00
Josh Durgin
e420dc723f Merge pull request #8079 from dillaman/wip-14413
rbd-mirror: integrate with image sync state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 17:27:30 -07:00
Jason Dillaman
a60f38df61 test: remove broken negative test cases
These should be reimplemented using google mock instead of
virtual functions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:20 -07:00
Jason Dillaman
24e50a1e24 rbd-mirror: integrate new bootstrap state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:18 -07:00
Jason Dillaman
e1fa689977 rbd-mirror: simple image bootstrap state machine
This state machine will handle the simple cases of creating
a local image from a remote image, registering to the remote
journal, and sync'ing the image contents.

There are several TODOs for future remaining work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:16 -07:00
Jason Dillaman
3b1db9bbf5 rbd-mirror: helper state machine for opening local image
This state machine will open a local image and request the
exclusive lock.  If the open or lock fails, it will automatically
close the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:14 -07:00
Jason Dillaman
d61293d4da rbd-mirror: helper state machine for closing librbd images
librbd ImageCtx's cannot be deleted from within the librbd thread.  This
state machine will perform the deletion from the rbd-mirror work queue
thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:08 -07:00
Josh Durgin
5a082ed5ef Merge pull request #7979 from dillaman/wip-14413
rbd-mirror: remote to local cluster image sync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 17:14:01 -07:00
Josh Durgin
4ac23b9759 Merge pull request #8102 from dillaman/wip-librados-aio-notify-redux
librados: cancel aio notification linger op upon completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 16:23:25 -07:00
Josh Durgin
7585b03c95 Merge pull request #8099 from dillaman/wip-15121
cls_rbd: protect against excessively large object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 15:44:35 -07:00
Orit Wasserman
67eadeb625 Merge pull request #8100 from linuxbox2/ldap-cmake
cmake: avoid false-positive LDAP header detect

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-14 22:16:09 +01:00
Josh Durgin
b3f7dd29da Merge pull request #8104 from dillaman/wip-rbd-read-flags
qa/workunits/rbd: do not use object map during read flag testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 14:11:49 -07:00
Jason Dillaman
aef7f9e268 qa/workunits/rbd: do not use object map during read flag testing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:06:41 -04:00
Jason Dillaman
7a33ab7f5d librados: cancel aio notification linger op upon completion
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 15:21:01 -04:00
Matt Benjamin
bcddb5672b cmake: avoid false-positive LDAP header detect
Pre-setting a value in OPENLDAP_INCLUDE_DIR broke the subsequent
test.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-14 14:11:45 -04:00
Jason Dillaman
4aff4ea329 cls_rbd: protect against excessively large object maps
Fixes: #15121

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 13:57:28 -04:00
Josh Durgin
71a1e66570 Merge pull request #8094 from dillaman/wip-librbd-image-watch-unregister
librbd: handle unregistering the image watcher when disconnected

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 10:28:17 -07:00
Jason Dillaman
740b95051b librbd: handle unregistering the image watcher when disconnected
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 12:15:46 -04:00
Sage Weil
4b27b34324 Merge pull request #7913 from liewegas/wip-list-encode
include/encoding: do not try to be clever with list encoding
2016-03-14 10:53:08 -04:00
Sage Weil
de0328d1be Merge pull request #7915 from ceph/wip-librados-stat2
librados: stat2 with higher time precision

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 10:52:15 -04:00
Sage Weil
203d604d72 Merge pull request #7964 from liewegas/wip-crush-jewel
crush: update tunable docs.  change default profile to jewel

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-14 10:51:40 -04:00
Sage Weil
2f24cf9da0 Merge pull request #8035 from liewegas/wip-bluestore
osd: bluestore updates, scrub fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-14 10:50:58 -04:00
Sage Weil
8c9190fae6 Merge pull request #8050 from liewegas/wip-15077
os/filestore: fix punch hole usage in _zero

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-14 10:50:06 -04:00
Sage Weil
fed796dea7 Merge pull request #8064 from liewegas/wip-zlib-test
unittest_compression_zlib: do not assume buffer will be null terminated
2016-03-14 10:49:45 -04:00
Sage Weil
af0e063576 Merge pull request #7870 from stiopaa1/blueStoreRemoveIncludes
osd: bluestore: remove unneeded includes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-14 09:59:52 -04:00
Sage Weil
376936a426 Merge pull request #7871 from xiexingguo/xxg-wip-cleanasync
msg: async: small cleanups

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-03-14 08:27:47 -04:00
Kefu Chai
0d6d340087 Merge pull request #7170 from trociny/wip-freebsd-misc
FreeBSD related fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-14 17:38:05 +08:00
Kefu Chai
10990bd6a1 Merge pull request #7947 from saru95/patch---2
ceph.in: Minor python3 specific changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-14 17:36:25 +08:00
Kefu Chai
f9a1f05bed Merge pull request #7974 from tchaikov/wip-buffer-eq-neq
buffer: add symmetry operator==() and operator!=()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 17:35:05 +08:00
Loic Dachary
e530ade4d4 Merge pull request #8074 from tchaikov/wip-ceph-detect-init-test
ceph-detect-init: add debian/jessie test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-13 16:40:49 +07:00
Kefu Chai
7c62ddf523 ceph-detect-init: return None at seeing unknown debian distro
* return None at seeing unknown debian distros
* add test for this accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-13 15:09:11 +08:00
Haomai Wang
1d685bbbc7 Merge pull request #8046 from xiexingguo/xxg-wip-fixpc
msg: async: fix perf counter description and simplify _send_keepalive_or_ack

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-03-13 12:19:57 +08:00
Haomai Wang
497cde4067 Merge pull request #7949 from wjin/fix
Event: fix clock skew problem

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-03-13 12:15:53 +08:00
Yehuda Sadeh
206699670e Merge pull request #8076 from ceph/wip-rgw-ldap
Wip rgw ldap

This follows a revert of the previous PR. This branch has some build related fixes.
2016-03-12 20:10:02 -08:00
Yehuda Sadeh
a014ad92fd Merge pull request #8075 from ceph/revert-7985-rgw-token-7
Revert "rgw ldap"

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-12 20:07:52 -08:00
Yehuda Sadeh
52ccf75cff Revert "rgw ldap" 2016-03-12 20:07:04 -08:00
Jason Dillaman
e2bbd17a02 test: verify proper update of object map during rbd-mirror image sync
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:17 -05:00
Jason Dillaman
0ef801f563 rbd-mirror: update object map while performing image sync
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:17 -05:00
Jason Dillaman
9465d3b5d7 rbd-mirror: temporarily disable support for cloned images
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:17 -05:00
Jason Dillaman
18bfef9a48 test: unit test cases for rbd mirror image sync
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:17 -05:00
Jason Dillaman
cacb48b1b4 rbd-mirror: image sync state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
4411212049 test: unit tests for rbd:🪞:image_sync::ImageCopyRequest
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
e530fbf22f rbd-mirror: state machine to iterate and copy all image objects
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
c7f5f9da34 librbd: track maximum object count during mirror sync
If the sync is interrupted, it is possible the image the source
image is shrunk.  Therefore, the sync process needs to track
the maximum known object extent of the image so objects can
be properly freed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
cee931f87a test: test cases for rbd-mirror image sync point state machines
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
47181120c8 rbd-mirror: new image sync point create/prune state machines
These are responsible for creating/removing snapshots in the
remote image and updating the client registration to account
for the snapshots.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
acd40abe9f librbd: added equality operator to MirrorPeer journal types
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00
Jason Dillaman
1c8b62185f librbd: async version of snap create and snap remove
This will be utilized by the RBD mirror daemon when creating
sync points.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-12 22:40:16 -05:00