mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-25 00:12:08 +08:00
Fix for JobWrapper.finish, dataset state no longer flushed prior to other attributes ( e.g., metadata) being flushed.
This commit is contained in:
@@ -400,11 +400,6 @@ class JobWrapper( object ):
|
||||
else:
|
||||
job.state = 'ok'
|
||||
for dataset_assoc in job.output_datasets:
|
||||
if stderr:
|
||||
dataset_assoc.dataset.dataset.state = model.Dataset.states.ERROR
|
||||
else:
|
||||
dataset_assoc.dataset.dataset.state = model.Dataset.states.OK
|
||||
dataset_assoc.dataset.dataset.flush()
|
||||
for dataset in dataset_assoc.dataset.dataset.history_associations: #need to update all associated output hdas, i.e. history was shared with job running
|
||||
dataset.blurb = 'done'
|
||||
dataset.peek = 'no peek'
|
||||
@@ -424,6 +419,11 @@ class JobWrapper( object ):
|
||||
else:
|
||||
dataset.blurb = "empty"
|
||||
dataset.flush()
|
||||
if stderr:
|
||||
dataset_assoc.dataset.dataset.state = model.Dataset.states.ERROR
|
||||
else:
|
||||
dataset_assoc.dataset.dataset.state = model.Dataset.states.OK
|
||||
dataset_assoc.dataset.dataset.flush()
|
||||
|
||||
# Save stdout and stderr
|
||||
if len( stdout ) > 32768:
|
||||
|
||||
Reference in New Issue
Block a user