qa/ceph_test_case: support CephFS recovery pools

Add support for testing recovery of CephFS metadata into an alternate
RADOS pool, useful as a disaster recovery mechanism that avoids
modifying the metadata in-place.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit c85562c94a80b8a18975b8d0ee6a7fbd932cf024)

diff --git a/qa/tasks/ceph_test_case.py b/qa/tasks/ceph_test_case.py
index 0f66106c9f1f0ef0b87b5402867af105e28ece76..5767df4611de9727763f44a30b004c8d6c20fe4b 100644 (file)
--- a/qa/tasks/ceph_test_case.py
+++ b/qa/tasks/ceph_test_case.py
@@ -18,6 +18,7 @@ class CephTestCase(unittest.TestCase):
     # Environment references
     mounts = None
     fs = None
+    recovery_fs = None
     ceph_cluster = None
     mds_cluster = None
     mgr_cluster = None

diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py
index 1181c80048fb21e30ce49cbaa1d1908e62512d43..d3c1154ca86aabe7b27df4f2cf0df8a3f6295f11 100644 (file)
--- a/qa/tasks/cephfs/cephfs_test_case.py
+++ b/qa/tasks/cephfs/cephfs_test_case.py
@@ -105,6 +105,7 @@ class CephFSTestCase(CephTestCase):
         self.mds_cluster.mds_fail()
         self.mds_cluster.delete_all_filesystems()
         self.fs = None # is now invalid!
+        self.recovery_fs = None
 
         # In case the previous filesystem had filled up the RADOS cluster, wait for that
         # flag to pass.