]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: load data pools before deleting fs
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Dec 2020 18:19:57 +0000 (10:19 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Jan 2021 20:55:24 +0000 (12:55 -0800)
Otherwise current data pools at time of deletion may not be known.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
qa/tasks/cephfs/filesystem.py

index 8df09412576a176578155de5db20b6f573fe4174..fa5df325f4b8fab51e02323eb0d3ba6a2a7668d2 100644 (file)
@@ -651,6 +651,8 @@ class Filesystem(MDSCluster):
         log.info('Destroying file system ' + self.name +  ' and related '
                  'pools')
 
+        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(
@@ -659,7 +661,7 @@ class Filesystem(MDSCluster):
         self.mon_manager.raw_cluster_cmd('osd', 'pool', 'rm',
             self.get_metadata_pool_name(), self.get_metadata_pool_name(),
             '--yes-i-really-really-mean-it')
-        for poolname in self.get_data_pool_names():
+        for poolname in data_pools:
             try:
                 self.mon_manager.raw_cluster_cmd('osd', 'pool', 'rm', poolname,
                     poolname, '--yes-i-really-really-mean-it')