Skip to content

Commit 3709ef1

Browse files
authored
Merge pull request #5746 from DIRACGridBot/cherry-pick-2-a43bd24b5-integration
[sweep:integration] hackaton fix (wms): JobAgent submitJob inputs
2 parents fc3b964 + fd8f3d7 commit 3709ef1

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/DIRAC/Resources/Computing/InProcessComputingElement.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def submitJob(self, executableFile, proxy=None, inputs=None, **kwargs):
4545
:param str executableFile: file to execute via systemCall.
4646
Normally the JobWrapperTemplate when invoked by the JobAgent.
4747
:param str proxy: the proxy used for running the job (the payload). It will be dumped to a file.
48+
:param list inputs: dependencies of executableFile
4849
"""
4950
payloadEnv = dict(os.environ)
5051
payloadProxy = ""

src/DIRAC/Resources/Computing/PoolComputingElement.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ def submitJob(self, executableFile, proxy=None, inputs=None, **kwargs):
101101
102102
:param str executableFile: location of the executable file
103103
:param str proxy: payload proxy
104+
:param list inputs: dependencies of executableFile
104105
105106
:return: S_OK/S_ERROR of the result of the job submission
106107
"""

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ def _submitJob(
624624
return result
625625

626626
wrapperFile = result["Value"][0]
627-
inputs = result["Value"][1:]
627+
inputs = list(result["Value"][1:])
628628
jobReport.setJobStatus(minorStatus="Submitting To CE")
629629

630630
self.log.info("Submitting JobWrapper", "%s to %sCE" % (os.path.basename(wrapperFile), self.ceName))

0 commit comments

Comments
 (0)