ensure operations are on the request's current data

shared/workspaces/workspaces/workflow/schema.py

@@ -276,9 +276,6 @@ class WorkflowRequest(JSONSerializable):
     def update_cleaned(self, cleaned: bool):
         self.cleaned = cleaned
 
-    def update_htcondor_job_id(self, job_id: int | None):
-        self.htcondor_job_id = job_id
-
     def __getitem__(self, item):
         return self.files
 

shared/workspaces/workspaces/workflow/services/interfaces.py

@@ -180,3 +180,12 @@ class WorkflowInfoIF(ABC):
         :return:
         """
         pass
+
+    def refresh_request(self, request: WorkflowRequest) -> WorkflowRequest:
+        """
+        Refresh an in use request object with current data
+
+        :param request: the request to be refreshed
+        :return: the updated WorkflowRequest object
+        """
+        pass

shared/workspaces/workspaces/workflow/services/workflow_info.py

@@ -280,3 +280,13 @@ class WorkflowInfo(WorkflowInfoIF):
         """
         request.update_cleaned(update_flag)
         self.save_request(request)
+
+    def refresh_request(self, request: WorkflowRequest) -> WorkflowRequest:
+        """
+        Ensure we are operating on an up-to-date object
+
+        :return: updated WorkflowRequest object
+        """
+
+        request = self.session.merge(request)
+        return request

shared/workspaces/workspaces/workflow/services/workflow_service.py

@@ -944,10 +944,12 @@ class WorkflowMessageHandler:
                     self.send_external_event("update", **tack_on)
 
         elif message["type"] == "workflow-failed":
+            request = self.info.refresh_request(request)
             status = WorkflowRequestState.Error.name
             self._post_workflow_cleanup(message, request, "failed")
 
         elif message["type"] == "workflow-aborted":
+            request = self.info.refresh_request(request)
             status = WorkflowRequestState.Failed.name
             self._post_workflow_cleanup(message, request, "failed")
 
@@ -1009,6 +1011,7 @@ class WorkflowMessageHandler:
             self.messenger.send_message(**iterations_msg)
 
         elif message["type"] == "workflow-complete":
+            request = self.info.refresh_request(request)
             status = WorkflowRequestState.Complete.name
             self._post_workflow_cleanup(message, request, "complete")
 
@@ -1180,21 +1183,19 @@ class WorkflowMessageHandler:
             result = injector.clear_subspace()
             if result is False:
                 # the processing directory somehow disappeared, mark as cleaned to avoid further errors
-                request.update_cleaned(True)
+                request.cleaned = True
 
-    def clean_workflow(self, request: WorkflowRequest):
+    @staticmethod
+    def clean_workflow(request: WorkflowRequest):
         if request.htcondor_job_id is not None:
             # Request has a set condor_job_id; unset it
             logger.info(f"Workflow #{request.workflow_request_id} finished; unsetting HTCondor ID")
-            request.update_htcondor_job_id(None)
+            request.htcondor_job_id = None
 
         if request.controller == "VLASS" and "vlass_" in request.results_dir:
             # request is initiated and controlled by VLASS Manager cleanup system.
             # Mark request as cleaned to bypass WS Annihilator and prevent clogging the logs
-            request.update_cleaned(True)
-
-        # let's try forcing save here too...
-        self.info.save_request(request)
+            request.cleaned = True
 
     @staticmethod
     def write_vlass_result_file(wf_request: WorkflowRequest, message: dict):