From: Douglas Fuller <dfuller@redhat.com>
Date: Wed, 12 Jul 2017 15:41:11 +0000 (-0500)
Subject: qa/ceph_test_case: support CephFS recovery pools
X-Git-Tag: v12.2.1~5^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47e485e5ccedce3977b30503e05b743e09fc7c77;p=ceph.git

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 0f66106c9f1f..5767df4611de 100644
--- 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 1181c80048fb..d3c1154ca86a 100644
--- 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.