attempt to fix iceprod - condor queue sync issues (#412)

* allow queued->complete transition, and add more logging * <bot> update requirements-docs.txt * <bot> update requirements-tests.txt * <bot> update requirements.txt * fix string formatting --------- Co-authored-by: github-actions <[email protected]>
WIPACrepo · Jan 3, 2025 · bc84d94 · bc84d94
1 parent c17940a
commit bc84d94
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/iceprod/server/plugins/condor.py b/iceprod/server/plugins/condor.py
@@ -773,11 +773,13 @@ async def job_update(self, job: CondorJob):
 
         try:
             if job.status == JobStatus.IDLE:
+                logging.info("task %s.%s is now queued", job.dataset_id, job.task_id)
                 await self.task_idle(job)
             elif job.status == JobStatus.RUNNING:
+                logging.info("task %s.%s is now processing", job.dataset_id, job.task_id)
                 await self.task_processing(job)
         except Exception:
-            pass
+            logging.warning("failed to update task status", exc_info=True)
 
     async def finish(self, job_id: CondorJobId, success: bool = True, resources: dict | None = None, reason: str | None = None, stats: dict | None = None):
         """

diff --git a/iceprod/server/states.py b/iceprod/server/states.py
@@ -39,7 +39,7 @@
 TASK_STATUS = {
     'idle': ['waiting', 'suspended'],
     'waiting': ['queued', 'idle', 'suspended'],
-    'queued': ['processing', 'idle', 'waiting', 'suspended', 'failed'],
+    'queued': ['processing', 'idle', 'waiting', 'suspended', 'failed', 'complete'],
     'processing': ['idle', 'waiting', 'suspended', 'failed', 'complete'],
     'suspended': ['idle', 'waiting'],
     'failed': ['idle', 'waiting'],

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.87
+boto3==1.35.91
     # via iceprod (setup.py)
-botocore==1.35.87
+botocore==1.35.91
     # via
     #   boto3
     #   s3transfer
@@ -35,7 +35,7 @@ certifi==2024.12.14
     #   requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
 cryptography==44.0.0
     # via

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.87
+boto3==1.35.91
     # via
     #   iceprod (setup.py)
     #   moto
-botocore==1.35.87
+botocore==1.35.91
     # via
     #   boto3
     #   moto
@@ -36,9 +36,9 @@ certifi==2024.12.14
     #   requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
-coverage[toml]==7.6.9
+coverage[toml]==7.6.10
     # via
     #   iceprod (setup.py)
     #   pytest-cov
@@ -56,7 +56,7 @@ exceptiongroup==1.2.2
     #   pytest
 flake8==7.1.1
     # via iceprod (setup.py)
-flexmock==0.12.1
+flexmock==0.12.2
     # via iceprod (setup.py)
 h11==0.14.0
     # via httpcore
@@ -95,7 +95,7 @@ mccabe==0.7.0
     # via flake8
 mock==5.1.0
     # via iceprod (setup.py)
-moto[s3]==5.0.24
+moto[s3]==5.0.25
     # via iceprod (setup.py)
 motor==3.6.0
     # via iceprod (setup.py)
@@ -105,7 +105,7 @@ pluggy==1.5.0
     # via pytest
 psutil==6.1.1
     # via iceprod (setup.py)
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
     # via moto
 pyasn1==0.6.1
     # via ldap3

diff --git a/requirements.txt b/requirements.txt
@@ -12,9 +12,9 @@ attrs==24.3.0
     # via
     #   jsonschema
     #   referencing
-boto3==1.35.87
+boto3==1.35.91
     # via iceprod (setup.py)
-botocore==1.35.87
+botocore==1.35.91
     # via
     #   boto3
     #   s3transfer
@@ -31,7 +31,7 @@ certifi==2024.12.14
     #   requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
 cryptography==44.0.0
     # via