From b5c1aa79cf08c695a9fd4fee6173afdc95309f11 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 5 Jul 2016 07:21:42 +0000
Subject: [PATCH] Task #9607: minor bug fix, TaskNotFoundException unknown.
logging.
---
MAC/Services/src/PipelineControl.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py
index 3146d9467f8..987f5614dce 100755
--- a/MAC/Services/src/PipelineControl.py
+++ b/MAC/Services/src/PipelineControl.py
@@ -236,7 +236,7 @@ class PipelineDependencies(object):
radb_task = self.rarpc.getTask(otdb_id=otdb_id)
if radb_task is None:
- raise TaskNotFoundException("otdb_id %s not found in RADB" % (otdb_id,))
+ raise PipelineDependencies.TaskNotFoundException("otdb_id %s not found in RADB" % (otdb_id,))
predecessor_radb_ids = radb_task['predecessor_ids']
predecessor_tasks = self.rarpc.getTasks(task_ids=predecessor_radb_ids)
@@ -253,7 +253,7 @@ class PipelineDependencies(object):
radb_task = self.rarpc.getTask(otdb_id=otdb_id)
if radb_task is None:
- raise TaskNotFoundException("otdb_id %s not found in RADB" % (otdb_id,))
+ raise PipelineDependencies.TaskNotFoundException("otdb_id %s not found in RADB" % (otdb_id,))
successor_radb_ids = radb_task['successor_ids']
successor_tasks = self.rarpc.getTasks(task_ids=successor_radb_ids) if successor_radb_ids else []
@@ -272,11 +272,11 @@ class PipelineDependencies(object):
try:
myState = self.getState(otdbId)
predecessorStates = self.getPredecessorStates(otdbId)
- except TaskNotFoundException, e:
+ except PipelineDependencies.TaskNotFoundException, e:
logger.error("canStart(%s): Error obtaining task states, not starting pipeline: %s", otdbId, e)
return False
- logger.debug("canStart(%s)? state = %s, predecessors = %s", otdbId, myState, predecessorStates)
+ logger.info("canStart(%s)? state = %s, predecessors = %s", otdbId, myState, predecessorStates)
return (
myState == "scheduled" and
@@ -481,7 +481,7 @@ class PipelineControl(OTDBBusListener):
# to be cancelled as well.
if not self.slurm.isQueuedOrRunning(otdbId):
- logger.info("_stopPipeline: Job %s not running")
+ logger.info("_stopPipeline: Job %s not running", otdbId)
return
def cancel(jobName):
--
GitLab