From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 11 Dec 2020 23:49:40 +0000 (-0800)
Subject: qa: accept timeout argument in run_shell
X-Git-Tag: v15.2.9~112^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38550%2Fhead;p=ceph.git

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 <pdonnell@redhat.com>
---

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 7a833a118253..7d9edda2769b 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):
         """