From 448aac5528eaea69ca6b17eaedcf26e5838bd699 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Fri, 3 Jan 2025 13:40:13 -0600 Subject: [PATCH] update task queued/processing when doing cross-check --- iceprod/server/plugins/condor.py | 2 ++ iceprod/server/states.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/iceprod/server/plugins/condor.py b/iceprod/server/plugins/condor.py index eb669fc0..ef1b2458 100644 --- a/iceprod/server/plugins/condor.py +++ b/iceprod/server/plugins/condor.py @@ -858,6 +858,8 @@ async def check(self): reason = extra.get('HoldReason', 'Job has failed') logger.info("job %s %s.%s removed from cross-check: %r", job_id, job.dataset_id, job.task_id, reason) self.submitter.remove(job_id, reason=reason) + else: + self.job_update(job) await self.check_history() diff --git a/iceprod/server/states.py b/iceprod/server/states.py index 9c0113f4..f44153cf 100644 --- a/iceprod/server/states.py +++ b/iceprod/server/states.py @@ -40,7 +40,7 @@ 'idle': ['waiting', 'suspended'], 'waiting': ['queued', 'idle', 'suspended'], 'queued': ['processing', 'idle', 'waiting', 'suspended', 'failed', 'complete'], - 'processing': ['idle', 'waiting', 'suspended', 'failed', 'complete'], + 'processing': ['idle', 'waiting', 'queued', 'suspended', 'failed', 'complete'], 'suspended': ['idle', 'waiting'], 'failed': ['idle', 'waiting'], 'complete': [],