Skip to content

Commit bfc0b4f

Browse files
committed
test/librbd/test_notify.py: drop RBD_DISABLE_UPDATE_FEATURES
This was put in place in commit 9c0b239 ("qa/upgrade: conditionally disable update_features tests") to paper over a backwards compatibility issue that arose from commit 01ff153 ("librbd: make all maintenance op notifications async"). It's not needed in squid or later because upgrades from octopus are tested only until reef. Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 49dbabc commit bfc0b4f

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/test/librbd/test_notify.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,15 @@ def slave(ioctx):
143143
assert(not image.is_exclusive_lock_owner())
144144
assert(list(image.list_snaps()) == [])
145145

146-
if 'RBD_DISABLE_UPDATE_FEATURES' not in os.environ:
147-
print("update_features")
148-
assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
149-
image.update_features(RBD_FEATURE_OBJECT_MAP, False)
150-
assert(not image.is_exclusive_lock_owner())
151-
assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0)
152-
image.update_features(RBD_FEATURE_OBJECT_MAP, True)
153-
assert(not image.is_exclusive_lock_owner())
154-
assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
155-
assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0)
156-
else:
157-
print("skipping update_features")
146+
print("update_features")
147+
assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
148+
image.update_features(RBD_FEATURE_OBJECT_MAP, False)
149+
assert(not image.is_exclusive_lock_owner())
150+
assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0)
151+
image.update_features(RBD_FEATURE_OBJECT_MAP, True)
152+
assert(not image.is_exclusive_lock_owner())
153+
assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0)
154+
assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0)
158155

159156
print("rebuild object map")
160157
image.rebuild_object_map()

0 commit comments

Comments
 (0)