update sources to v12.1.1

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

diff --git a/ceph/qa/tasks/cephfs/filesystem.py b/ceph/qa/tasks/cephfs/filesystem.py
index 8efd05e9eca19a87869e89ad50f87cbe9b71980c..0d3fc547b7e2b6f0b9e3f3bffca50f0300d63b85 100644 (file)
--- a/ceph/qa/tasks/cephfs/filesystem.py
+++ b/ceph/qa/tasks/cephfs/filesystem.py
@@ -425,9 +425,6 @@ class Filesystem(MDSCluster):
     def set_allow_dirfrags(self, yes):
         self.mon_manager.raw_cluster_cmd("fs", "set", self.name, "allow_dirfrags", str(yes).lower(), '--yes-i-really-mean-it')
 
-    def set_allow_multimds(self, yes):
-        self.mon_manager.raw_cluster_cmd("fs", "set", self.name, "allow_multimds", str(yes).lower(), '--yes-i-really-mean-it')
-
     def get_pgs_per_fs_pool(self):
         """
         Calculate how many PGs to use when creating a pool, in order to avoid raising any
@@ -457,7 +454,14 @@ class Filesystem(MDSCluster):
         self.mon_manager.raw_cluster_cmd('fs', 'new',
                                          self.name, self.metadata_pool_name, data_pool_name)
         # Turn off spurious standby count warnings from modifying max_mds in tests.
-        self.mon_manager.raw_cluster_cmd('fs', 'set', self.name, 'standby_count_wanted', '0')
+        try:
+            self.mon_manager.raw_cluster_cmd('fs', 'set', self.name, 'standby_count_wanted', '0')
+        except CommandFailedError as e:
+            if e.exitstatus == 22:
+                # standby_count_wanted not available prior to luminous (upgrade tests would fail otherwise)
+                pass
+            else:
+                raise
 
         self.getinfo(refresh = True)