From eb87b54a5c8b03dfdda6dea48fd34a523a0c79d7 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 28 Apr 2020 15:49:19 +0530 Subject: [PATCH] qa/cephfs: add FUSE module before running mount -t fusectl Also, change timeout from 15 minutes to 30 seconds for the command "mount -t fusectl xxx xxx" since 15 minutes is too much as per Zheng. Fixes: https://tracker.ceph.com/issues/45304 Signed-off-by: Rishabh Dave (cherry picked from commit 2d7c32997b9e5db5a13f5ed6e117ac9f71dac370) --- qa/tasks/cephfs/fuse_mount.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 68fc387d7aa56..64a797ae2e992 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -94,13 +94,18 @@ class FuseMount(CephFSMount): run_cmd.extend(fuse_cmd) def list_connections(): + from teuthology.misc import get_system_type + + conn_dir = "/sys/fs/fuse/connections" + + self.client_remote.run(args=['sudo', 'modprobe', 'fuse'], + check_status=False) self.client_remote.run( - args=["sudo", "mount", "-t", "fusectl", "/sys/fs/fuse/connections", "/sys/fs/fuse/connections"], - check_status=False, - timeout=(15*60) - ) + args=["sudo", "mount", "-t", "fusectl", conn_dir, conn_dir], + check_status=False, timeout=(30)) + try: - ls_str = self.client_remote.sh("ls /sys/fs/fuse/connections", + ls_str = self.client_remote.sh("ls " + conn_dir, stdout=StringIO(), timeout=(15*60)).strip() except CommandFailedError: -- 2.39.5