From: Xiubo Li Date: Mon, 1 Jun 2020 01:57:24 +0000 (-0400) Subject: qa/tasks/cephfs/test_scrub.py: use umount_wait to avoid ceph-fuse stuck X-Git-Tag: v15.2.4~25^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35616%2Fhead;p=ceph.git qa/tasks/cephfs/test_scrub.py: use umount_wait to avoid ceph-fuse stuck If the ceph-fuse client need to flush the caps and does sync wait, the umount() will just return successfully, then the netns container will be destroyed and the network will not be reachable, but the ceph-fuse daemon is still stucked and waiting for the flush caps ack. This will cause the ceph-fuse daemon get stuck forever and if the mds daemons get restarted, it will try to reconnect the clients, but the stucked ceph-fuse daemnon won't reply to it, because it is not reachable any more. Fixes: https://tracker.ceph.com/issues/45665 Signed-off-by: Xiubo Li (cherry picked from commit a7423b2286154a4403e586b5148984649f988a03) --- diff --git a/qa/tasks/cephfs/test_scrub.py b/qa/tasks/cephfs/test_scrub.py index 226db815740f..c36316f4122f 100644 --- a/qa/tasks/cephfs/test_scrub.py +++ b/qa/tasks/cephfs/test_scrub.py @@ -89,7 +89,7 @@ class DupInodeWorkload(Workload): def damage(self): temp_bin_path = "/tmp/10000000000.00000000_omap.bin" - self._mount.umount() + self._mount.umount_wait() self._filesystem.mds_asok(["flush", "journal"]) self._filesystem.mds_stop() self._filesystem.rados(["getomapval", "10000000000.00000000",