diff options
author | Zuul <zuul@review.opendev.org> | 2023-04-20 16:02:50 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-04-20 16:02:50 +0000 |
commit | 45d0947adb5a35e449214e711df63ffb88000028 (patch) | |
tree | f6ca5530f248a82328eb54e0ee33bfda3b543c22 | |
parent | 7c58d8b4e565cb490367e4ce73400df1ff3cf25a (diff) | |
parent | 6e08f15074baa608d238959aa8f3fd6c9838ad7d (diff) | |
download | cinder-45d0947adb5a35e449214e711df63ffb88000028.tar.gz |
Merge "RBD: Skip update_features when features = 0"
-rw-r--r-- | cinder/tests/unit/volume/drivers/test_rbd.py | 23 | ||||
-rw-r--r-- | cinder/volume/drivers/rbd.py | 6 | ||||
-rw-r--r-- | releasenotes/notes/rbd-update-features-bugfix-df97b50864ce9712.yaml | 6 |
3 files changed, 33 insertions, 2 deletions
diff --git a/cinder/tests/unit/volume/drivers/test_rbd.py b/cinder/tests/unit/volume/drivers/test_rbd.py index 57dae3af1..f1ffeb89e 100644 --- a/cinder/tests/unit/volume/drivers/test_rbd.py +++ b/cinder/tests/unit/volume/drivers/test_rbd.py @@ -3361,6 +3361,17 @@ class RBDTestCase(test.TestCase): {'provider_location': "{\"saved_features\":%s}" % image_features}, ret) + @common_mocks + def test_enable_multiattach_no_features(self): + image = self.mock_proxy.return_value.__enter__.return_value + image.features.return_value = 0 + + ret = self.driver._enable_multiattach(self.volume_a) + + image.update_features.assert_not_called() + + self.assertEqual({'provider_location': '{"saved_features":0}'}, ret) + @ddt.data(MULTIATTACH_FULL_FEATURES, MULTIATTACH_REDUCED_FEATURES) @common_mocks def test_disable_multiattach(self, features): @@ -3374,6 +3385,18 @@ class RBDTestCase(test.TestCase): self.assertEqual({'provider_location': None}, ret) + @common_mocks + def test_disable_multiattach_no_features(self): + image = self.mock_proxy.return_value.__enter__.return_value + self.volume_a.provider_location = '{"saved_features": 0}' + image.features.return_value = 0 + + ret = self.driver._disable_multiattach(self.volume_a) + + image.update_features.assert_not_called() + + self.assertEqual({'provider_location': None}, ret) + class ManagedRBDTestCase(test_driver.BaseDriverTestCase): driver_name = "cinder.volume.drivers.rbd.RBDDriver" diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py index 6cc86c2c5..e710fd356 100644 --- a/cinder/volume/drivers/rbd.py +++ b/cinder/volume/drivers/rbd.py @@ -968,7 +968,8 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD, with RBDVolumeProxy(self, vol_name) as image: image_features = image.features() change_features = self.MULTIATTACH_EXCLUSIONS & image_features - image.update_features(change_features, False) + if change_features != 0: + image.update_features(change_features, False) return {'provider_location': self._dumps({'saved_features': image_features})} @@ -980,7 +981,8 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD, provider_location = json.loads(volume.provider_location) image_features = provider_location['saved_features'] change_features = self.MULTIATTACH_EXCLUSIONS & image_features - image.update_features(change_features, True) + if change_features != 0: + image.update_features(change_features, True) except IndexError: msg = "Could not find saved image features." raise RBDDriverException(reason=msg) diff --git a/releasenotes/notes/rbd-update-features-bugfix-df97b50864ce9712.yaml b/releasenotes/notes/rbd-update-features-bugfix-df97b50864ce9712.yaml new file mode 100644 index 000000000..fa066bd17 --- /dev/null +++ b/releasenotes/notes/rbd-update-features-bugfix-df97b50864ce9712.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + `Bug #1997980 <https://bugs.launchpad.net/cinder/+bug/1997980>`_: RBD: + Fixed failure to update rbd image features for multi-attach when + features = 0. |