From d4b8f94cf8d95ebb277b550fc6ebc3468052a39c Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 26 Sep 2018 07:38:58 -0700 Subject: [PATCH] qa: do not cleanup sandbox on error Otherwise the command will hang if the mount is broken. Fixes: http://tracker.ceph.com/issues/36184 Signed-off-by: Patrick Donnelly --- qa/tasks/workunit.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py index 315ece6b004..79eb64e39a1 100644 --- a/qa/tasks/workunit.py +++ b/qa/tasks/workunit.py @@ -414,9 +414,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir, finally: log.info('Stopping %s on %s...', tests, role) args=['sudo', 'rm', '-rf', '--', workunits_file, clonedir] - if cleanup: - log.info("and cleaning up scratch: {}".format(scratch_tmp)) - args.append(scratch_tmp) + # N.B. don't cleanup scratch_tmp! If the mount is broken then rm will hang. remote.run( logger=log.getChild(role), args=args,