From: Ernesto Puerta Date: Thu, 1 Oct 2020 10:43:52 +0000 (+0200) Subject: mgr/dashboard: fix broken backporting X-Git-Tag: v14.2.12~10^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37505%2Fhead;p=ceph.git mgr/dashboard: fix broken backporting A [previous backport](https://github.com/ceph/ceph/pull/35367) from a [master PR](https://github.com/ceph/ceph/pull/32829) changed the testing condition for PG status from 'incomplete' to 'unknown'. Fixes: https://tracker.ceph.com/issues/46815 Co-authored-by: Mykola Golub Signed-off-by: Ernesto Puerta --- diff --git a/src/pybind/mgr/dashboard/services/rbd.py b/src/pybind/mgr/dashboard/services/rbd.py index fbec61049b90..55c6f542c0a5 100644 --- a/src/pybind/mgr/dashboard/services/rbd.py +++ b/src/pybind/mgr/dashboard/services/rbd.py @@ -87,7 +87,7 @@ class RbdConfiguration(object): result = [] else: # pool config pg_status = list(CephService.get_pool_pg_status(self._pool_name).keys()) - if len(pg_status) == 1 and 'unknown' in pg_status[0]: + if len(pg_status) == 1 and 'incomplete' in pg_status[0]: # If config_list would be called with ioctx if it's a bad pool, # the dashboard would stop working, waiting for the response # that would not happen. diff --git a/src/pybind/mgr/dashboard/tests/test_rbd_service.py b/src/pybind/mgr/dashboard/tests/test_rbd_service.py index bd0da4020c11..a4511fa9d123 100644 --- a/src/pybind/mgr/dashboard/tests/test_rbd_service.py +++ b/src/pybind/mgr/dashboard/tests/test_rbd_service.py @@ -27,7 +27,7 @@ class RbdServiceTest(unittest.TestCase): get.return_value = { 'by_pool': { '1': {'active+clean': 32}, - '2': {'unknown': 32}, + '2': {'creating+incomplete': 32}, } } config_list.return_value = [1, 2, 3]