Skip to content

Commit

Permalink
Merge pull request #2363 from ganga-devs/remove_finaliseOnMaster
Browse files Browse the repository at this point in the history
Remove `finaliseOnMaster`
  • Loading branch information
mesmith75 authored Jun 20, 2024
2 parents 8ea2af0 + 7be0cca commit d447bcb
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions ganga/GangaDirac/Lib/Backends/DiracBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@


configDirac = getConfig('DIRAC')
default_finaliseOnMaster = configDirac['default_finaliseOnMaster']
default_downloadOutputSandbox = configDirac['default_downloadOutputSandbox']
default_unpackOutputSandbox = configDirac['default_unpackOutputSandbox']
logger = getLogger()
Expand Down Expand Up @@ -131,8 +130,6 @@ class DiracBase(IBackend):
'credential_requirements': ComponentItem('CredentialRequirement', defvalue=DiracProxy),
'blockSubmit': SimpleItem(defvalue=True,
doc='Shall we use the block submission?'),
'finaliseOnMaster': SimpleItem(defvalue=default_finaliseOnMaster,
doc='Finalise the subjobs all in one go when they are all finished.'),
'downloadSandbox': SimpleItem(defvalue=default_downloadOutputSandbox,
doc='Do you want to download the output sandbox when the job finalises.'),
'unpackOutputSandbox': SimpleItem(defvalue=default_unpackOutputSandbox, hidden=True,
Expand Down Expand Up @@ -1084,15 +1081,6 @@ async def _internal_job_finalisation(job, updated_dirac_status):
job (Job): Thi is the job we want to finalise
updated_dirac_status (str): String representing the Ganga finalisation state of the job failed/completed
"""
if job.backend.finaliseOnMaster and job.master and updated_dirac_status == 'completed':
job.updateStatus('completing')
allComplete = True
for sj in job.master.subjobs:
if sj.status not in ['completing', 'failed', 'killed', 'removed', 'completed']:
allComplete = False
break
if allComplete:
DiracBase.finalise_jobs(job.master.subjobs, job.master.backend.downloadSandbox)

if updated_dirac_status == 'completed':
try:
Expand Down

0 comments on commit d447bcb

Please sign in to comment.