From 7d0a789b1bc1f4c0100b9472f04a3b86cef94f05 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 30 Jan 2020 08:32:50 -0600 Subject: [PATCH] qa/tasks/ceph_manager: make fix_pgp_num behave when no pool is found Fixes: 2020-01-30T04:41:24.697 INFO:tasks.thrashosds.thrasher:fixing pg num pool None 2020-01-30T04:41:24.698 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last): File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-sage-testing-2020-01-29-1034/qa/tasks/ceph_manager.py", line 1070, in wrapper return func(self) File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-sage-testing-2020-01-29-1034/qa/tasks/ceph_manager.py", line 1200, in _do_thrash self.choose_action()() File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-sage-testing-2020-01-29-1034/qa/tasks/ceph_manager.py", line 768, in fix_pgp_num if self.ceph_manager.set_pool_pgpnum(pool, force): File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-sage-testing-2020-01-29-1034/qa/tasks/ceph_manager.py", line 2088, in set_pool_pgpnum assert isinstance(pool_name, six.string_types) AssertionError Signed-off-by: Sage Weil --- qa/tasks/ceph_manager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index 0832265252b..e49b7109aec 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -761,6 +761,8 @@ class OSDThrasher(Thrasher): """ if pool is None: pool = self.ceph_manager.get_pool() + if not pool: + return force = False else: force = True -- 2.47.3