External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Push changes before rebasing

Browse Source
This commit is contained in:
Jim Ladd
2021-02-25 11:07:12 -08:00
parent f9b439ae82
commit 67046513ae
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views/__init__.py
View File

@@ -905,7 +905,7 @@ class SystemJobEventsList(SubListAPIView):
def get_queryset(self): def get_queryset(self):
job = self.get_parent_object() job = self.get_parent_object()
self.check_parent_access(job) self.check_parent_access(job)
qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line') qs = job.system_job_events.select_related('host').filter(job_created=job.created).order_by('start_line')
return qs.all() return qs.all()
class ProjectUpdateCancel(RetrieveAPIView): class ProjectUpdateCancel(RetrieveAPIView):

8
awx/main/scheduler/task_manager.py
View File

@@ -261,11 +261,6 @@ class TaskManager:
logger.debug("No controllers available in group {} to run {}".format(rampart_group.name, task.log_format)) logger.debug("No controllers available in group {} to run {}".format(rampart_group.name, task.log_format))
return return
# Before task leaves pending state, ensure that job_event partitions exist
# TODO: Currently, only creating partition for jobs. Drop contiditional once
# there are partitions for all job event types
if task_actual['type'] == 'job':
create_partition()
task.status = 'waiting' task.status = 'waiting'
(start_status, opts) = task.pre_start() (start_status, opts) = task.pre_start()
@@ -315,6 +310,9 @@ class TaskManager:
def post_commit(): def post_commit():
if task.status != 'failed' and type(task) is not WorkflowJob: if task.status != 'failed' and type(task) is not WorkflowJob:
# Ensure that job event partition exists
create_partition('main_jobevent')
task_cls = task._get_task_class() task_cls = task._get_task_class()
task_cls.apply_async( task_cls.apply_async(
[task.pk], [task.pk],