qa: add Filesystem.reset helper

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit eccf961697ec365c39cf22c8fe8afee5ff88f776)

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 3bb6a926cd7506ae2faef66e654e53349c2463ef..6926ed66344ce01d655476440525ec785c932163 100644 (file)
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -561,6 +561,9 @@ class Filesystem(MDSCluster):
         assert(mds_map['max_mds'] == max_mds)
         assert(mds_map['in'] == list(range(0, max_mds)))
 
+    def reset(self):
+        self.mon_manager.raw_cluster_cmd("fs", "reset", str(self.name), '--yes-i-really-mean-it')
+
     def fail(self):
         self.mon_manager.raw_cluster_cmd("fs", "fail", str(self.name))
 

diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py
index 9513a84b7678561acf62e5b98778c418b63453f0..4365f9c1f8680ef29aeee0314cb657508ba49403 100644 (file)
--- a/qa/tasks/cephfs/test_admin.py
+++ b/qa/tasks/cephfs/test_admin.py
@@ -450,7 +450,7 @@ class TestMirroringCommands(CephFSTestCase):
         self.assertTrue(uuid_peer_b is not None)
         # reset filesystem
         self.fs.fail()
-        self.fs.mon_manager.raw_cluster_cmd("fs", "reset", self.fs.name, "--yes-i-really-mean-it")
+        self.fs.reset()
         self.fs.wait_for_daemons()
         self._verify_mirroring(self.fs.name, "disabled")
 

diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py
index 0e1c0bd727393284cd1c53b414e5190d96ce5099..0f0a352a2ac27a3461e011a9361f22587106dff5 100644 (file)
--- a/qa/tasks/cephfs/test_data_scan.py
+++ b/qa/tasks/cephfs/test_data_scan.py
@@ -341,8 +341,7 @@ class TestDataScan(CephFSTestCase):
 
         # Reset the MDS map in case multiple ranks were in play: recovery procedure
         # only understands how to rebuild metadata under rank 0
-        self.fs.mon_manager.raw_cluster_cmd('fs', 'reset', self.fs.name,
-                '--yes-i-really-mean-it')
+        self.fs.reset()
 
         self.fs.mds_restart()
 

diff --git a/qa/tasks/cephfs/test_recovery_pool.py b/qa/tasks/cephfs/test_recovery_pool.py
index f050638bbc98a11f2e84fd169cee509efd9e4fac..2838f67b0dba3c19959835bcb6950d053f06b4ec 100644 (file)
--- a/qa/tasks/cephfs/test_recovery_pool.py
+++ b/qa/tasks/cephfs/test_recovery_pool.py
@@ -134,8 +134,7 @@ class TestRecoveryPool(CephFSTestCase):
 
         # Reset the MDS map in case multiple ranks were in play: recovery procedure
         # only understands how to rebuild metadata under rank 0
-        self.fs.mon_manager.raw_cluster_cmd('fs', 'reset', self.fs.name,
-                '--yes-i-really-mean-it')
+        self.fs.reset()
 
         self.fs.table_tool([self.fs.name + ":0", "reset", "session"])
         self.fs.table_tool([self.fs.name + ":0", "reset", "snap"])