From 3a88d820d5cba4b9d8465fcf52d5bc3561fb13d3 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 11 Mar 2021 07:30:40 -0800 Subject: [PATCH] qa: remove fallback for non-multifs ceph version This code was for jewel (IIRC) or older. Signed-off-by: Patrick Donnelly (cherry picked from commit 4c3c69b2304367a5b42e911241cb9460cd6f2ab0) --- qa/tasks/cephfs/filesystem.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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)) -- 2.39.5