]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: make mount to be compatible with nautilus for blocklist 48182/head
authorXiubo Li <xiubli@redhat.com>
Tue, 20 Sep 2022 05:33:04 +0000 (13:33 +0800)
committerXiubo Li <xiubli@redhat.com>
Tue, 20 Sep 2022 05:33:04 +0000 (13:33 +0800)
Fixes: https://tracker.ceph.com/issues/57580
Signed-off-by: Xiubo Li <xiubli@redhat.com>
qa/tasks/cephfs/mount.py

index 874b27f4f60d5f06b56a14b5fcab1544aa466253..e7c2c942ca758abec3631b5e649f45c6381e5acd 100644 (file)
@@ -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):