Skip to content

Commit

Permalink
fix dirac rt handler
Browse files Browse the repository at this point in the history
  • Loading branch information
mesmith75 committed Apr 4, 2024
1 parent e172bba commit 36657bf
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions ganga/GangaLHCb/Lib/RTHandlers/GaudiExecRTHandlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ def master_prepare(self, app, appmasterconfig):
app (GaudiExec): This application is only expected to handle GaudiExec Applications here
appmasterconfig (unknown): Output passed from the application master configuration call
"""

print('jeffs dong a mater prepare')
# First check the remote options or inputfiles exist
j = app.getJobObject()
for file_ in j.inputfiles:
Expand All @@ -537,9 +537,9 @@ def master_prepare(self, app, appmasterconfig):

cred_req = app.getJobObject().backend.credential_requirements
check_creds(cred_req)

print('master sandbox prepare')
inputsandbox, outputsandbox = master_sandbox_prepare(app, appmasterconfig)

print('master sandbox output', outputsandbox)
# If we are getting the metadata we need to make sure the summary.xml is
# added to the output sandbox if not there already.
if app.getMetadata and 'summary.xml' not in outputsandbox:
Expand Down Expand Up @@ -588,7 +588,6 @@ def master_prepare(self, app, appmasterconfig):
app.uploadedInput.getReplicas()
if len(app.uploadedInput.locations) >= 2:
logger.debug("Uploaded input archive already at two locations, not replicating again")
return
else:
replicateJobFile(app.uploadedInput)

Expand All @@ -605,6 +604,7 @@ def prepare(self, app, appsubconfig, appmasterconfig, jobmasterconfig):
appmasterconfig (unknown): Output passed from the application master_configure call
jobmasterconfig (tuple): Output from the master job prepare step
"""
print('jeffs doing a prepare')
cred_req = app.getJobObject().backend.credential_requirements
check_creds(cred_req)
# NB this needs to be removed safely
Expand Down Expand Up @@ -642,7 +642,7 @@ def prepare(self, app, appsubconfig, appmasterconfig, jobmasterconfig):
app.uploadedInput = master_job.application.uploadedInput
app.jobScriptArchive = master_job.application.jobScriptArchive

logger.debug("uploadedInput: %s" % app.uploadedInput)
print("uploadedInput: %s" % app.uploadedInput)

rep_data = app.uploadedInput.getReplicas()

Expand All @@ -656,12 +656,16 @@ def prepare(self, app, appsubconfig, appmasterconfig, jobmasterconfig):
if isinstance(file_, DiracFile) and 'LFN:' + file_.lfn not in inputsandbox:
inputsandbox += ['LFN:' + file_.lfn]

logger.debug("Input Sand: %s" % inputsandbox)
print("Input Sand: %s" % inputsandbox)

logger.debug("input_data: %s" % input_data)
print("input_data: %s" % input_data)

outputfiles = [this_file for this_file in job.outputfiles if isinstance(this_file, DiracFile)]

print('outputfiles list: ', outputfiles)

print('outputsandbox: ', outputsandbox)

scriptToRun = getScriptName(app)
# Already added to sandbox uploaded as LFN

Expand Down

0 comments on commit 36657bf

Please sign in to comment.