]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #38775 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 9 Jan 2021 03:06:58 +0000 (19:06 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 9 Jan 2021 03:06:58 +0000 (19:06 -0800)
* 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>
1  2 
qa/tasks/cephfs/filesystem.py

index 6b1bea65e0b5da50c69c9072678a2255950039cc,66449bd3e0a54d09c6be9f3f15296e8055f3f383..6c5dcbeb7a4b21dd66e7a15f73377b065d2235a1
@@@ -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(