From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 30 Sep 2018 00:37:12 +0000 (-0700)
Subject: qa: add timeout to cleaning up workunit sandbox
X-Git-Tag: v13.2.3~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b51c98e0b9e8be0b32b7af0e8e7db613288c8b8d;p=ceph.git

qa: add timeout to cleaning up workunit sandbox

If there is a bug preventing rm from completing, the workunit will get stuck.

Fixes: http://tracker.ceph.com/issues/36184
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3a10d74f3aa4901dd9edffc0061992073ae67085)
---

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 71f272e3d08c..022ef5d06667 100644
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -480,7 +480,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
                 )
                 if cleanup:
                     args=['sudo', 'rm', '-rf', '--', scratch_tmp]
-                    remote.run(logger=log.getChild(role), args=args)
+                    remote.run(logger=log.getChild(role), args=args, timeout=(15*60))
     finally:
         log.info('Stopping %s on %s...', tests, role)
         args=['sudo', 'rm', '-rf', '--', workunits_file, clonedir]