From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 8 Aug 2023 01:14:55 +0000 (-0400)
Subject: qa/tasks/ceph_test_case: rollback configs using `config reset`
X-Git-Tag: v20.0.0~1793^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bfb320da9219ed4a1878719f2c95ca5f155d858;p=ceph.git

qa/tasks/ceph_test_case: rollback configs using `config reset`

This is faster and catches config changes made outside this interface.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/tasks/ceph_test_case.py b/qa/tasks/ceph_test_case.py
index 8bcbcf5a62b6..79bd260e729a 100644
--- a/qa/tasks/ceph_test_case.py
+++ b/qa/tasks/ceph_test_case.py
@@ -150,8 +150,6 @@ class CephTestCase(unittest.TestCase, RunCephCmd):
                 ctx=self.ctx, logger=log.getChild('ceph_manager'))
 
     def setUp(self):
-        self._mon_configs_set = set()
-
         self._init_mon_manager()
         self.admin_remote = self.ceph_cluster.admin_remote
 
@@ -166,17 +164,14 @@ class CephTestCase(unittest.TestCase, RunCephCmd):
                 raise self.skipTest("Require `memstore` OSD backend (test " \
                         "would take too long on full sized OSDs")
 
+        self.ceph_cluster.mon_manager.raw_cluster_cmd("config", "dump")
+
     def tearDown(self):
-        self.config_clear()
+        self.ceph_cluster.mon_manager.raw_cluster_cmd("config", "reset", str(self.ctx.conf_epoch))
 
         self.ceph_cluster.mon_manager.raw_cluster_cmd("log",
             "Ended test {0}".format(self.id()))
 
-    def config_clear(self):
-        for section, key in self._mon_configs_set:
-            self.config_rm(section, key)
-        self._mon_configs_set.clear()
-
     def _fix_key(self, key):
         return str(key).replace(' ', '_')
 
@@ -194,12 +189,9 @@ class CephTestCase(unittest.TestCase, RunCephCmd):
     def config_rm(self, section, key):
        key = self._fix_key(key)
        self.ceph_cluster.mon_manager.raw_cluster_cmd("config", "rm", section, key)
-       # simplification: skip removing from _mon_configs_set;
-       # let tearDown clear everything again
 
     def config_set(self, section, key, value):
        key = self._fix_key(key)
-       self._mon_configs_set.add((section, key))
        self.ceph_cluster.mon_manager.raw_cluster_cmd("config", "set", section, key, str(value))
 
     def cluster_cmd(self, command: str):