From 0b4721e2b9dcbf951185971cbba5f44ff88d4ce6 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 11 Dec 2020 15:49:40 -0800 Subject: [PATCH] qa: accept timeout argument in run_shell This was fixed differently in master in a way that's not easy to backport. Fixes: https://tracker.ceph.com/issues/48524 Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/mount.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 7a833a11825..7d9edda2769 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -201,7 +201,7 @@ class CephFSMount(object): return self.run_shell(["bash", "-c", Raw(f"'{payload}'")], **kwargs) def run_shell(self, args, wait=True, stdin=None, check_status=True, - omit_sudo=True): + omit_sudo=True, timeout=10800): if isinstance(args, str): args = args.split() @@ -209,7 +209,8 @@ class CephFSMount(object): return self.client_remote.run(args=args, stdout=StringIO(), stderr=StringIO(), wait=wait, stdin=stdin, check_status=check_status, - omit_sudo=omit_sudo) + omit_sudo=omit_sudo, + timeout=timeout) def open_no_data(self, basename): """ -- 2.47.3