update task queued/processing when doing cross-check (#413)

* update task queued/processing when doing cross-check * make sure completion action accepts queued status * <bot> update requirements-docs.txt * <bot> update requirements-tests.txt * <bot> update requirements.txt --------- Co-authored-by: github-actions <[email protected]>
WIPACrepo · Jan 3, 2025 · 5160c7c · 5160c7c
1 parent 2fc4b00
commit 5160c7c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/iceprod/rest/handlers/tasks.py b/iceprod/rest/handlers/tasks.py
@@ -976,7 +976,7 @@ async def post(self, task_id):
 
         filter_query = {
             'task_id': task_id,
-            'status': 'processing',
+            'status': {'$in': task_prev_statuses('complete')},
             'instance_id': data['instance_id'],
         }
         update_query = {

diff --git 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
@@ -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': [],

diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -16,9 +16,9 @@ attrs==24.3.0
     #   referencing
 babel==2.16.0
     # via sphinx
-boto3==1.35.91
+boto3==1.35.92
     # via iceprod (setup.py)
-botocore==1.35.91
+botocore==1.35.92
     # via
     #   boto3
     #   s3transfer

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -14,11 +14,11 @@ attrs==24.3.0
     #   referencing
 beautifulsoup4==4.12.3
     # via iceprod (setup.py)
-boto3==1.35.91
+boto3==1.35.92
     # via
     #   iceprod (setup.py)
     #   moto
-botocore==1.35.91
+botocore==1.35.92
     # via
     #   boto3
     #   moto

diff --git a/requirements.txt b/requirements.txt
@@ -12,9 +12,9 @@ attrs==24.3.0
     # via
     #   jsonschema
     #   referencing
-boto3==1.35.91
+boto3==1.35.92
     # via iceprod (setup.py)
-botocore==1.35.91
+botocore==1.35.92
     # via
     #   boto3
     #   s3transfer