From: Rishabh Dave <ridave@redhat.com>
Date: Fri, 31 Jul 2020 08:57:16 +0000 (+0530)
Subject: qa/cephfs: modify recreate() in filesystem.py
X-Git-Tag: v17.0.0~1150^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a7eaec9e2604de2efe39ef0f07eed914c8d3f36e;p=ceph.git

qa/cephfs: modify recreate() in filesystem.py

Modify cephfs.filesystem.Filesystem.recreate() method to delete only the
FS represented by the object instead of deleting the every FS on the
Ceph cluster.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index b5a01290349e8..c93ac27ee3220 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -643,6 +643,12 @@ class Filesystem(MDSCluster):
             self.data_pool_name = None
             self.data_pools = None
 
+    def recreate(self):
+        self.destroy(reset_obj_attrs=False)
+
+        self.create()
+        self.getinfo(refresh=True)
+
     def check_pool_application(self, pool_name):
         osd_map = self.mon_manager.get_osd_dump_json()
         for pool in osd_map['pools']:
@@ -968,12 +974,6 @@ class Filesystem(MDSCluster):
         else:
             return self.mds_ids[0]
 
-    def recreate(self):
-        log.info("Creating new filesystem")
-        self.delete_all_filesystems()
-        self.id = None
-        self.create()
-
     def put_metadata_object_raw(self, object_id, infile):
         """
         Save an object to the metadata pool