From 833944652b572fbff39285e7abd0c987bfa10f85 Mon Sep 17 00:00:00 2001 From: Mark Syms Date: Tue, 7 May 2019 10:50:24 +0100 Subject: [PATCH] CA-315152: gc_force needs to take gc_active lock not running Signed-off-by: Mark Syms --- drivers/cleanup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py index 7b84a1518..4f20e9063 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2767,7 +2767,7 @@ def gc_force(session, srUuid, force = False, dryRun = False, lockSR = False): Util.log("=== SR %s: gc_force ===" % srUuid) init(srUuid) sr = SR.getInstance(srUuid, session, lockSR, True) - if not lockRunning.acquireNoblock(): + if not lockActive.acquireNoblock(): abort(srUuid) else: Util.log("Nothing was running, clear to proceed") @@ -2783,7 +2783,7 @@ def gc_force(session, srUuid, force = False, dryRun = False, lockSR = False): finally: sr.cleanup() sr.logFilter.logState() - lockRunning.release() + lockActive.release() def get_state(srUuid): """Return whether GC/coalesce is currently running or not. The information