import ceph nautilus 14.2.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / rbd.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/rbd.py b/ceph/src/pybind/mgr/dashboard/controllers/rbd.py
index ea1f2043d7e0c18abf8cebe8723c6144bda81c17..24c068a7e5f672de72c926f73997585eb9bff128 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/rbd.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/rbd.py
@@ -275,12 +275,16 @@ class Rbd(RESTController):
                 _sort_features(curr_features, enable=False)
                 for feature in curr_features:
                     if feature not in features and feature in self.ALLOW_DISABLE_FEATURES:
+                        if feature not in format_bitmask(image.features()):
+                            continue
                         f_bitmask = format_features([feature])
                         image.update_features(f_bitmask, False)
                 # check enabled features
                 _sort_features(features)
                 for feature in features:
                     if feature not in curr_features and feature in self.ALLOW_ENABLE_FEATURES:
+                        if feature in format_bitmask(image.features()):
+                            continue
                         f_bitmask = format_features([feature])
                         image.update_features(f_bitmask, True)