From: Xiubo Li <xiubli@redhat.com>
Date: Tue, 20 Sep 2022 05:33:04 +0000 (+0800)
Subject: qa: make mount to be compatible with nautilus for blocklist
X-Git-Tag: v18.1.0~1040^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f18c39e25a788c907bd93ac54582372aa7c699dd;p=ceph.git

qa: make mount to be compatible with nautilus for blocklist

Fixes: https://tracker.ceph.com/issues/57580
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 874b27f4f60d..e7c2c942ca75 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -171,7 +171,12 @@ class CephFSMount(object):
     def is_blocked(self):
         self.fs = Filesystem(self.ctx, name=self.cephfs_name)
 
-        output = self.fs.mon_manager.raw_cluster_cmd(args='osd blocklist ls')
+        try:
+            output = self.fs.mon_manager.raw_cluster_cmd(args='osd blocklist ls')
+        except CommandFailedError:
+            # Fallback for older Ceph cluster
+            output = self.fs.mon_manager.raw_cluster_cmd(args='osd blacklist ls')
+
         return self.addr in output
 
     def is_stuck(self):