Skip to content

Remove unnecessary analysis input file update #1067

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

Merged
merged 1 commit into from
Feb 7, 2018
Merged

Remove unnecessary analysis input file update #1067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 2 additions & 15 deletions api/dao/containerstorage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,22 +404,9 @@ def inflate_job_info(self, analysis):
if next_job is None:
break
job = Job.load(next_job)
if job.id_ != str(analysis['job']):
if job.id_ != analysis['job']:
# Update analysis if job has changed
# Remove old inputs and replace with new job inputs
# (In practice these should never change)
files = analysis.get('files', [])
files[:] = [x for x in files if x.get('output')]

for i in getattr(job, 'inputs',{}):
fileref = job.inputs[i]
contref = containerutil.create_containerreference_from_filereference(job.inputs[i])
file_ = contref.find_file(fileref.name)
if file_:
file_['input'] = True
files.append(file_)

self.update_el(analysis['_id'], {'job': job.id_, 'files': files})
self.update_el(analysis['_id'], {'job': job.id_})

analysis['job'] = job
return analysis