From b51c98e0b9e8be0b32b7af0e8e7db613288c8b8d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 29 Sep 2018 17:37:12 -0700 Subject: [PATCH] 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 (cherry picked from commit 3a10d74f3aa4901dd9edffc0061992073ae67085) --- qa/tasks/workunit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py index 71f272e3d08c8..022ef5d066672 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] -- 2.39.5