Merge PR #17533 into master

* refs/remotes/upstream/pull/17533/head:
	qa: log ceph-fuse kill/cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2017-09-08 11:23:23 -07:00
commit 1b7aae6cdc
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -319,6 +319,7 @@ class FuseMount(CephFSMount):
"""
Terminate the client without removing the mount point.
"""
log.info('Killing ceph-fuse connection on {name}...'.format(name=self.client_remote.name))
self.fuse_daemon.stdin.close()
try:
self.fuse_daemon.wait()
@ -329,6 +330,7 @@ class FuseMount(CephFSMount):
"""
Follow up ``kill`` to get to a clean unmounted state.
"""
log.info('Cleaning up killed ceph-fuse connection')
self.umount()
self.cleanup()