opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try to refresh input_datasets.dataset before accessing creating_job -- this is yet another attempt to resolve this being unavailable at job finish time.

Browse Source
This commit is contained in:
Dannon Baker
2016-06-15 13:27:57 -04:00
parent f7a6a2323d
commit 5707954491
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/actions/post.py
+6 -4
View File
@@ -427,10 +427,12 @@ class DeleteIntermediatesAction(DefaultJobAction):
else:
log.debug("No job found yet for wfi_step %s, (step %s)" % (wfi_step, wfi_step.workflow_step))
for j2c in jobs_to_check:
creating_jobs = [(x, x.dataset.creating_job) for x in j2c.input_datasets if x.dataset and x.dataset.creating_job]
for (x, creating_job) in creating_jobs:
sa_session.refresh(creating_job)
sa_session.refresh(x)
sa_session.refresh(j2c)
creating_jobs = []
for input_dataset in j2c.input_datasets:
sa_session.refresh(input_dataset)
sa_session.refresh(input_dataset.dataset.creating_job)
creating_jobs.append( (input_dataset, input_dataset.dataset.creating_job) )
for input_dataset in [x.dataset for (x, creating_job) in creating_jobs if creating_job.workflow_invocation_step and creating_job.workflow_invocation_step.workflow_invocation == wfi]:
safe_to_delete = True
for job_to_check in [d_j.job for d_j in input_dataset.dependent_jobs]: