From: Bill Scales Date: Thu, 14 Aug 2025 12:04:25 +0000 (+0100) Subject: qa: rados.py shouldn't clean up if test failed X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F64889%2Fhead;p=ceph.git qa: rados.py shouldn't clean up if test failed Throw exception for a test failure slightly earlier, before trying to clean up. If the test has failed and the watchdog has killed the OSDs then the clean up will fail leading to a further exception that will end up getting reported as the test failure reason Signed-off-by: Bill Scales --- diff --git a/qa/tasks/rados.py b/qa/tasks/rados.py index 89e0b4dbcf7..6bd57cb09ff 100644 --- a/qa/tasks/rados.py +++ b/qa/tasks/rados.py @@ -346,6 +346,11 @@ def task(ctx, config): watched_process.set_exception(e) run.wait(tests.values()) + + # If test has failed then don't try to clean up + if watched_process.exception: + raise watched_process.exception + wait_for_all_active_clean_pgs = config.get("wait_for_all_active_clean_pgs", False) # usually set when we do min_size testing. if wait_for_all_active_clean_pgs: @@ -354,9 +359,6 @@ def task(ctx, config): manager.wait_for_clean() manager.wait_for_all_osds_up(timeout=1800) - if watched_process.exception: - raise watched_process.exception - for pool in created_pools: manager.wait_snap_trimming_complete(pool) manager.remove_pool(pool)