From 9bb45b000722a89089accbf717b322562564a308 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Sat, 19 Apr 2014 21:42:27 +0200 Subject: [PATCH] Fixing bug in ec release --- src/nepi/execution/ec.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py index 94784b27..776881ce 100644 --- a/src/nepi/execution/ec.py +++ b/src/nepi/execution/ec.py @@ -875,12 +875,6 @@ class ExperimentController(object): if not guids: guids = self.resources - # Remove all pending tasks from the scheduler queue - for tid in list(self._scheduler.pending): - self._scheduler.remove(tid) - - self._runner.empty() - for guid in guids: rm = self.get_resource(guid) self.schedule("0s", rm.release) @@ -899,6 +893,13 @@ class ExperimentController(object): if self._state == ECState.FAILED: raise RuntimeError("EC failure. Can not exit gracefully") + # Remove all pending tasks from the scheduler queue + for tid in list(self._scheduler.pending): + self._scheduler.remove(tid) + + # Remove pending tasks from the workers queue + self._runner.empty() + self.release() # Mark the EC state as TERMINATED -- 2.47.0