Merge pull request #8113 from fstagni/80_avoid_repeat_optimization

[8.0] fix: avoid repeating optimization when job goes to STAGING

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Client/JobStatus.py

@@ -95,7 +95,7 @@ def __init__(self, state):
             STAGING: State(4, [CHECKING, WAITING, FAILED, KILLED], defState=STAGING),
             SCOUTING: State(3, [CHECKING, FAILED, STALLED, KILLED], defState=SCOUTING),
             CHECKING: State(2, [SCOUTING, STAGING, WAITING, RESCHEDULED, FAILED, DELETED, KILLED], defState=CHECKING),
-            RECEIVED: State(1, [SCOUTING, CHECKING, WAITING, FAILED, DELETED, KILLED], defState=RECEIVED),
+            RECEIVED: State(1, [SCOUTING, CHECKING, STAGING, WAITING, FAILED, DELETED, KILLED], defState=RECEIVED),
             SUBMITTING: State(0, [RECEIVED, CHECKING, DELETED, KILLED], defState=SUBMITTING),  # initial state
         }
 

src/DIRAC/WorkloadManagementSystem/Executor/JobScheduling.py

@@ -591,6 +591,10 @@ def __requestStaging(self, jobState, stageLFNs):
         if not result["OK"]:
             return result
 
+        result = jobState.commitChanges()
+        if not result["OK"]:
+            self.jobLog.error("Could not save changes for job", result["Message"])
+
         return S_OK(stageLFNs)
 
     def __updateSharedSESites(self, jobManifest, stageSite, stagedLFNs, opData):