Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove finaliseOnMaster #2363

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Remove finaliseOnMaster #2363

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25b61b7
clean up finaliseOnMaster
mesmith75 Jun 19, 2024
a14d57b
Merge branch 'develop' into remove_finaliseOnMaster
mesmith75 Jun 20, 2024
7be0cca
Merge branch 'develop' into remove_finaliseOnMaster
mesmith75 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ganga/GangaDirac/Lib/Backends/DiracBase.py
View file
Open in desktop
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
Loading