From bfc0b4f3015ec79c00a0ab684a4b7d58cb667e86 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 8 Apr 2025 13:53:23 +0200 Subject: [PATCH] test/librbd/test_notify.py: drop RBD_DISABLE_UPDATE_FEATURES This was put in place in commit 9c0b239d70cd ("qa/upgrade: conditionally disable update_features tests") to paper over a backwards compatibility issue that arose from commit 01ff1530544c ("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 --- src/test/librbd/test_notify.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/test/librbd/test_notify.py b/src/test/librbd/test_notify.py index bef988808aef0..d0320dc282bf9 100755 --- a/src/test/librbd/test_notify.py +++ b/src/test/librbd/test_notify.py @@ -143,18 +143,15 @@ def slave(ioctx): assert(not image.is_exclusive_lock_owner()) assert(list(image.list_snaps()) == []) - if 'RBD_DISABLE_UPDATE_FEATURES' not in os.environ: - print("update_features") - assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0) - image.update_features(RBD_FEATURE_OBJECT_MAP, False) - assert(not image.is_exclusive_lock_owner()) - assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0) - image.update_features(RBD_FEATURE_OBJECT_MAP, True) - assert(not image.is_exclusive_lock_owner()) - assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0) - assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0) - else: - print("skipping update_features") + print("update_features") + assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0) + image.update_features(RBD_FEATURE_OBJECT_MAP, False) + assert(not image.is_exclusive_lock_owner()) + assert((image.features() & RBD_FEATURE_OBJECT_MAP) == 0) + image.update_features(RBD_FEATURE_OBJECT_MAP, True) + assert(not image.is_exclusive_lock_owner()) + assert((image.features() & RBD_FEATURE_OBJECT_MAP) != 0) + assert((image.flags() & RBD_FLAG_OBJECT_MAP_INVALID) != 0) print("rebuild object map") image.rebuild_object_map() -- 2.39.5