From: Stephan Müller Date: Wed, 13 Nov 2019 12:16:55 +0000 (+0100) Subject: mgr/dashboard: Fix pool renaming functionality X-Git-Tag: v14.2.12~15^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45aad70277fa5193277bd98db37fb2cb4fd874a5;p=ceph.git mgr/dashboard: Fix pool renaming functionality The problem was that, if a pool was renamed the routine to update tried to work on the old pool name and didn't used the info that the pool got renamed, therefore an error occurred in the UI saying that the pool could not be found. Fixes: https://tracker.ceph.com/issues/42776 Signed-off-by: Stephan Müller (cherry picked from commit de933cd3c82b6a7d5c4ddfa77804509c9fcaa3db) Conflicts: qa/tasks/mgr/dashboard/test_pool.py: - Ignore incoming quota test --- diff --git a/src/pybind/mgr/dashboard/controllers/pool.py b/src/pybind/mgr/dashboard/controllers/pool.py index 4737b01a28b8..c6919fc2a939 100644 --- a/src/pybind/mgr/dashboard/controllers/pool.py +++ b/src/pybind/mgr/dashboard/controllers/pool.py @@ -83,6 +83,8 @@ class Pool(RESTController): @pool_task('edit', ['{pool_name}']) def set(self, pool_name, flags=None, application_metadata=None, configuration=None, **kwargs): self._set_pool_values(pool_name, application_metadata, flags, True, kwargs) + if kwargs.get('pool'): + pool_name = kwargs['pool'] RbdConfiguration(pool_name).set_configuration(configuration) self._wait_for_pgs(pool_name)