From 5ef699a0e7696222e92e653b1e0028043efd9876 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Fri, 10 Sep 2010 17:28:30 +0200 Subject: [PATCH] =?utf8?q?Revert=20"jqueue:=20Resume=20jobs=20from=20=E2=80=9C?= =?utf8?q?waitlock=E2=80=9D=20status"?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 4008c8edae31a3971fa8c4b200238afc8005d3d4. While it worked in my initial tests, I've now found cases where this doesn't work properly as it is. More work is needed and will be done as part of the Ganeti 2.3 job queue changes. Signed-off-by: Michael Hanselmann Reviewed-by: Iustin Pop --- lib/jqueue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jqueue.py b/lib/jqueue.py index fe61c22..bd4d986 100644 --- a/lib/jqueue.py +++ b/lib/jqueue.py @@ -945,11 +945,11 @@ class JobQueue(object): status = job.CalcStatus() - if status in (constants.JOB_STATUS_QUEUED, - constants.JOB_STATUS_WAITLOCK): + if status in (constants.JOB_STATUS_QUEUED, ): self._wpool.AddTask((job, )) elif status in (constants.JOB_STATUS_RUNNING, + constants.JOB_STATUS_WAITLOCK, constants.JOB_STATUS_CANCELING): logging.warning("Unfinished job %s found: %s", job.id, job) job.MarkUnfinishedOps(constants.OP_STATUS_ERROR, -- 1.7.10.4