Merge pull request ceph#48182 from lxbsz/wip-57580

qa: make mount to be compatible with nautilus for blocklist Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Venky Shankar <[email protected]> Reviewed-by: Jos Collin <[email protected]>
selroc · Oct 10, 2022 · adc65d6 · adc65d6
2 parents 7d71f81 + f18c39e
commit adc65d6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
@@ -188,7 +188,12 @@ def assert_and_log_minimum_mount_details(self):
     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):