External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-09 03:59:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Don't iterate over parents, perform a final update at the end

Browse Source
This commit is contained in:
Matthew Jones
2017-01-24 16:21:50 -05:00
parent 2af98e5f58
commit 22a3e87720
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/models/jobs.py
View File

@@ -1013,22 +1013,14 @@ class JobEvent(CreatedModifiedModel):
updated_fields.add(field) updated_fields.add(field)
return updated_fields return updated_fields
def _update_parent_failed_and_changed(self): def _update_parents_failed_and_changed(self):
# Propagate failed and changed flags to parent events. # Update parent events to reflect failed, changed
if self.parent_uuid: runner_events = JobEvent.objects.filter(job=self.job,
parent = JobEvent.objects.filter(uuid=self.parent_uuid) event__startswith='runner_on')
if parent.exists(): changed_events = runner_events.filter(changed=True)
parent = parent[0] failed_events = runner_events.filter(failed=True)
update_fields = [] JobEvent.objects.filter(uuid__in=changed_events.values_list('parent_uuid', flat=True)).update(changed=True)
if self.failed and not parent.failed: JobEvent.objects.filter(uuid__in=failed_events.values_list('parent_uuid', flat=True)).update(failed=True)
parent.failed = True
update_fields.append('failed')
if self.changed and not parent.changed:
parent.changed = True
update_fields.append('changed')
if update_fields:
parent.save(update_fields=update_fields, from_parent_update=True)
parent._update_parent_failed_and_changed()
def _update_hosts(self, extra_host_pks=None): def _update_hosts(self, extra_host_pks=None):
# Update job event hosts m2m from host_name, propagate to parent events. # Update job event hosts m2m from host_name, propagate to parent events.
@@ -1114,13 +1106,10 @@ class JobEvent(CreatedModifiedModel):
super(JobEvent, self).save(*args, **kwargs) super(JobEvent, self).save(*args, **kwargs)
# Update related objects after this event is saved. # Update related objects after this event is saved.
if not from_parent_update: if not from_parent_update:
if self.parent_uuid:
self._update_parent_failed_and_changed()
# FIXME: The update_hosts() call (and its queries) are the current
# performance bottleneck....
if getattr(settings, 'CAPTURE_JOB_EVENT_HOSTS', False): if getattr(settings, 'CAPTURE_JOB_EVENT_HOSTS', False):
self._update_hosts() self._update_hosts()
if self.event == 'playbook_on_stats': if self.event == 'playbook_on_stats':
self._update_parents_failed_and_changed()
self._update_host_summary_from_stats() self._update_host_summary_from_stats()
@classmethod @classmethod