mirror of
https://github.com/ceph/ceph
synced 2025-02-24 11:37:37 +00:00
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:
commit
adc65d6bb4
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user