From 369fe9324587d2560c309b143001f7f0720ab8ae Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Tue, 21 Jul 2020 17:09:39 +0530 Subject: [PATCH] qa: Fix traceback during fs cleanup between tests The 'mon_allow_pool_delete' option is set to 'True' in 'setUp' of 'TestVolumes' and is cleared of in corresponding 'tearDown' function. Hence, any pool deletion in parent classes such as 'CephFSTestCase' would fail. This patch fixes the same by setting the config 'mon_allow_pool_delete' option in the 'CephFSTestCase'. Fixes: https://tracker.ceph.com/issues/46597 Signed-off-by: Kotresh HR (cherry picked from commit 381925d219ac2c847947ae1deeab31d6cc2f668f) --- qa/tasks/cephfs/cephfs_test_case.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py index bee9e7df918..5ca8f0d5483 100644 --- a/qa/tasks/cephfs/cephfs_test_case.py +++ b/qa/tasks/cephfs/cephfs_test_case.py @@ -64,6 +64,8 @@ class CephFSTestCase(CephTestCase): def setUp(self): super(CephFSTestCase, self).setUp() + self.config_set('mon', 'mon_allow_pool_delete', True) + if len(self.mds_cluster.mds_ids) < self.MDSS_REQUIRED: raise case.SkipTest("Only have {0} MDSs, require {1}".format( len(self.mds_cluster.mds_ids), self.MDSS_REQUIRED -- 2.47.3