Skip to content

Commit

Permalink
Merge pull request #7590 from DIRACGridBot/cherry-pick-2-e57a31060-in…
Browse files Browse the repository at this point in the history
…tegration

[sweep:integration] fix: AREX out and err need to exist before file integrity check
  • Loading branch information
fstagni authored Apr 23, 2024
2 parents f877d14 + 345f020 commit 08c6656
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/DIRAC/Resources/Computing/AREXComputingElement.py
Original file line number Diff line number Diff line change
Expand Up @@ -893,10 +893,8 @@ def getJobOutput(self, jobID, workingDirectory=None):
if remoteOutput == f"{stamp}.out":
with open(localOutput) as f:
stdout = f.read()
os.unlink(localOutput)
if remoteOutput == f"{stamp}.err":
with open(localOutput) as f:
stderr = f.read()
os.unlink(localOutput)

return S_OK((stdout, stderr))
2 changes: 2 additions & 0 deletions src/DIRAC/WorkloadManagementSystem/Utilities/RemoteRunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ def execute(self, command, workingDirectory=".", numberOfProcessors=1, cleanRemo
self.log.info("The output has been retrieved and declared complete")

# Clean up the job (local files not needed anymore)
os.remove(f"{stamp}.out")
os.remove(f"{stamp}.err")
os.remove(self.checkSumOutput)
os.remove(self.executable)

Expand Down

0 comments on commit 08c6656

Please sign in to comment.