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

Fix unintended slice job blocking

Browse Source
This commit is contained in:
Alan Rominger
2022-07-07 10:47:34 -04:00
committed by Seth Foster
parent 0a47d05d26
commit 8af4dd5988
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/scheduler/dependency_graph.py
View File

@@ -7,6 +7,11 @@ from awx.main.models import (
WorkflowJob, WorkflowJob,
) )
import logging
logger = logging.getLogger('awx.main.scheduler.dependency_graph')
class DependencyGraph(object): class DependencyGraph(object):
PROJECT_UPDATES = 'project_updates' PROJECT_UPDATES = 'project_updates'
@@ -36,6 +41,9 @@ class DependencyGraph(object):
self.data[self.WORKFLOW_JOB_TEMPLATES_JOBS] = {} self.data[self.WORKFLOW_JOB_TEMPLATES_JOBS] = {}
def mark_if_no_key(self, job_type, id, job): def mark_if_no_key(self, job_type, id, job):
if id is None:
logger.warning(f'Null dependency graph key from {job}, could be integrity error or bug, ignoring')
return
# only mark first occurrence of a task. If 10 of JobA are launched # only mark first occurrence of a task. If 10 of JobA are launched
# (concurrent disabled), the dependency graph should return that jobs # (concurrent disabled), the dependency graph should return that jobs
# 2 through 10 are blocked by job1 # 2 through 10 are blocked by job1
@@ -66,7 +74,10 @@ class DependencyGraph(object):
self.mark_if_no_key(self.JOB_TEMPLATE_JOBS, job.job_template_id, job) self.mark_if_no_key(self.JOB_TEMPLATE_JOBS, job.job_template_id, job)
def mark_workflow_job(self, job): def mark_workflow_job(self, job):
self.mark_if_no_key(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.workflow_job_template_id, job) if job.workflow_job_template_id:
self.mark_if_no_key(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.workflow_job_template_id, job)
elif job.unified_job_template_id: # for sliced jobs
self.mark_if_no_key(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.unified_job_template_id, job)
def project_update_blocked_by(self, job): def project_update_blocked_by(self, job):
return self.get_item(self.PROJECT_UPDATES, job.project_id) return self.get_item(self.PROJECT_UPDATES, job.project_id)