Merge pull request #48182 from lxbsz/wip-57580

qa: make mount to be compatible with nautilus for blocklist

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
This commit is contained in:
Rishabh Dave 2022-10-11 00:05:55 +05:30 committed by GitHub
commit adc65d6bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -188,7 +188,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):