fix bug in pipeline expiring/deletion

DZD-eV-Diabetes-Research · Dec 10, 2024 · c2a2762 · c2a2762
1 parent a63ebae
commit c2a2762
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/backend/mekeweserver/pipeline_status_clerk.py b/backend/mekeweserver/pipeline_status_clerk.py
@@ -408,7 +408,10 @@ def get_next_pipeline_that_is_expired(
             pipeline_status = MetaKeggPipelineDef.model_validate_json(
                 pipeline_state_json_raw
             )
-            if self.is_pipeline_run_expired(pipeline_status):
+            if (
+                self.is_pipeline_run_expired(pipeline_status)
+                and pipeline_status.state != "expired"
+            ):
                 if set_status_expired:
                     pipeline_status.state = "expired"
                     self.set_pipeline_run_definition(pipeline_status)
@@ -460,7 +463,7 @@ def is_pipeline_run_deletable(self, pipeline_status: MetaKeggPipelineDef):
             minutes=config.PIPELINE_RESULT_EXPIRED_AFTER_MIN
         )
         deleteable_datetime = expire_datetime + datetime.timedelta(
-            minutes=config.PIPELINE_ABANDONED_DEFINITION_DELETED_AFTER
+            minutes=config.PIPELINE_RESULT_DELETED_AFTER_MIN
         )
         if deleteable_datetime < datetime.datetime.now(tz=datetime.timezone.utc):
             return True