From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 9 Jan 2021 03:06:58 +0000 (-0800)
Subject: Merge PR #38775 into master
X-Git-Tag: v16.1.0~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52ef68c6812273cf3f41d1f6655513fb39212171;p=ceph.git

Merge PR #38775 into master

* refs/pull/38775/head:
	qa: remove ceph file systems on completion

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
---

52ef68c6812273cf3f41d1f6655513fb39212171
diff --cc qa/tasks/cephfs/filesystem.py
index 6b1bea65e0b5,66449bd3e0a5..6c5dcbeb7a4b
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@@ -654,21 -660,13 +667,24 @@@ class Filesystem(MDSCluster)
  
          self.getinfo(refresh = True)
  
 +    def run_client_payload(self, cmd):
 +        # avoid circular dep by importing here:
 +        from tasks.cephfs.fuse_mount import FuseMount
 +        d = misc.get_testdir(self._ctx)
 +        m = FuseMount(self._ctx, {}, d, "admin", self.client_remote, cephfs_name=self.name)
 +        m.mount()
 +        m.run_shell_payload(cmd)
 +        m.umount_wait(require_clean=True)
 +
      def destroy(self, reset_obj_attrs=True):
-         log.info('Destroying file system ' + self.name +  ' and related '
-                  'pools')
+         log.info(f'Destroying file system {self.name} and related pools')
+ 
+         if self.dead():
+             log.debug('already dead...')
+             return
  
 +        data_pools = self.get_data_pool_names(refresh=True)
 +
          # make sure no MDSs are attached to given FS.
          self.mon_manager.raw_cluster_cmd('fs', 'fail', self.name)
          self.mon_manager.raw_cluster_cmd(