From: Mykola Golub Date: Mon, 24 Apr 2017 14:23:21 +0000 (+0200) Subject: test/librbd/test_notify.py: don't disable feature in slave X-Git-Tag: v12.0.3~218^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e009e1bdd4b3997462feb9a050bd2eb201e028ba;p=ceph.git test/librbd/test_notify.py: don't disable feature in slave On jewel it will have stolen the exclusive lock. Instead, ensure that object map and fast diff are already disabled on the clone before the start of the test. Fixes: http://tracker.ceph.com/issues/19716 Signed-off-by: Mykola Golub --- diff --git a/src/test/librbd/test_notify.py b/src/test/librbd/test_notify.py index 6571935f961f..b44ef0cab302 100755 --- a/src/test/librbd/test_notify.py +++ b/src/test/librbd/test_notify.py @@ -64,6 +64,7 @@ def master(ioctx): image.create_snap('snap1') image.protect_snap('snap1') + features = features & ~(RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_FAST_DIFF) RBD().clone(ioctx, PARENT_IMG_NAME, 'snap1', ioctx, CLONE_IMG_NAME, features=features) with Image(ioctx, CLONE_IMG_NAME) as image: @@ -141,10 +142,7 @@ def slave(ioctx): assert(list(image.list_snaps()) == []) print("rebuild object map") - features = image.features() & ( - RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_FAST_DIFF) - if features: - image.update_features(features, False) + assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0) image.update_features(RBD_FEATURE_OBJECT_MAP, True) assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0) image.rebuild_object_map()