update ceph source to reef 18.1.2

[ceph.git] / ceph / qa / tasks / cephfs / cephfs_test_case.py

diff --git a/ceph/qa/tasks/cephfs/cephfs_test_case.py b/ceph/qa/tasks/cephfs/cephfs_test_case.py
index c76d28ba62fae8666f3aa163698dd866704da2b2..129b84790e90371de84af87d11836e87f8a2c11e 100644 (file)
--- a/ceph/qa/tasks/cephfs/cephfs_test_case.py
+++ b/ceph/qa/tasks/cephfs/cephfs_test_case.py
@@ -71,9 +71,6 @@ class CephFSTestCase(CephTestCase):
     # Whether to create the default filesystem during setUp
     REQUIRE_FILESYSTEM = True
 
-    # requires REQUIRE_FILESYSTEM = True
-    REQUIRE_RECOVERY_FILESYSTEM = False
-
     # create a backup filesystem if required.
     # required REQUIRE_FILESYSTEM enabled
     REQUIRE_BACKUP_FILESYSTEM = False
@@ -165,7 +162,7 @@ class CephFSTestCase(CephTestCase):
             # In case some test messed with auth caps, reset them
             for client_id in client_mount_ids:
                 cmd = ['auth', 'caps', f'client.{client_id}', 'mon','allow r',
-                       'osd', f'allow rw pool={self.fs.get_data_pool_name()}',
+                       'osd', f'allow rw tag cephfs data={self.fs.name}',
                        'mds', 'allow']
 
                 if self.run_cluster_cmd_result(cmd) == 0:
@@ -191,20 +188,6 @@ class CephFSTestCase(CephTestCase):
             self.backup_fs = self.mds_cluster.newfs(name="backup_fs")
             self.backup_fs.wait_for_daemons()
 
-        if self.REQUIRE_RECOVERY_FILESYSTEM:
-            if not self.REQUIRE_FILESYSTEM:
-                self.skipTest("Recovery filesystem requires a primary filesystem as well")
-            # After Octopus is EOL, we can remove this setting:
-            self.fs.mon_manager.raw_cluster_cmd('fs', 'flag', 'set',
-                                                'enable_multiple', 'true',
-                                                '--yes-i-really-mean-it')
-            self.recovery_fs = self.mds_cluster.newfs(name="recovery_fs", create=False)
-            self.recovery_fs.set_metadata_overlay(True)
-            self.recovery_fs.set_data_pool_name(self.fs.get_data_pool_name())
-            self.recovery_fs.create()
-            self.recovery_fs.getinfo(refresh=True)
-            self.recovery_fs.wait_for_daemons()
-
         # Load an config settings of interest
         for setting in self.LOAD_SETTINGS:
             setattr(self, setting, float(self.fs.mds_asok(