RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 05:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #30553 into master

Browse Source 
* refs/pull/30553/head:
	qa/tasks: check if fs mounted in umount_wait

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-11-20 15:31:33 -08:00
commit 5a0fa12513
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qa/tasks/cephfs/fuse_mount.py
View File

@ -305,6 +305,12 @@ class FuseMount(CephFSMount):
"""
:param force: Complete cleanly even if the MDS is offline
"""
if not (self.is_mounted() and self.fuse_daemon):
log.debug('ceph-fuse client.{id} is not mounted at {remote} {mnt}'.format(id=self.client_id,
remote=self.client_remote,
mnt=self.mountpoint))
return
if force:
assert not require_clean # mutually exclusive
@ -320,9 +326,8 @@ class FuseMount(CephFSMount):
self.umount()
try:
if self.fuse_daemon:
# Permit a timeout, so that we do not block forever
run.wait([self.fuse_daemon], timeout)
# Permit a timeout, so that we do not block forever
run.wait([self.fuse_daemon], timeout)
except MaxWhileTries:
log.error("process failed to terminate after unmount. This probably"
" indicates a bug within ceph-fuse.")