From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 11 Mar 2021 15:30:40 +0000 (-0800)
Subject: qa: remove fallback for non-multifs ceph version
X-Git-Tag: v16.2.2~8^2~5^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3a88d820d5cba4b9d8465fcf52d5bc3561fb13d3;p=ceph.git

qa: remove fallback for non-multifs ceph version

This code was for jewel (IIRC) or older.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4c3c69b2304367a5b42e911241cb9460cd6f2ab0)
---

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 6926ed66344ce..0c025d0a6d3af 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -879,15 +879,7 @@ class Filesystem(MDSCluster):
             mds.check_status()
 
         active_count = 0
-        try:
-            mds_map = self.get_mds_map(status=status)
-        except CommandFailedError as cfe:
-            # Old version, fall back to non-multi-fs commands
-            if cfe.exitstatus == errno.EINVAL:
-                mds_map = json.loads(
-                        self.mon_manager.raw_cluster_cmd('mds', 'dump', '--format=json'))
-            else:
-                raise
+        mds_map = self.get_mds_map(status=status)
 
         log.debug("are_daemons_healthy: mds map: {0}".format(mds_map))