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

Increase test coverage for task scheduler inventory updates

Browse Source 
Also fixes some bugs found in that process
This commit is contained in:
Matthew Jones
2017-05-11 14:34:40 -04:00
parent bdde87f7f5
commit 8bc1490368
4 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/scheduler/__init__.py
View File

@@ -239,22 +239,14 @@ class TaskManager():
return project_task
def create_inventory_update(self, task, inventory_source_task):
dep = InventorySource.objects.get(id=inventory_source_task.id).create_inventory_update(launch_type='dependency')
inventory_task = InventorySource.objects.get(id=inventory_source_task.id).create_inventory_update(launch_type='inventory_taskendency')
dep.created = task.created - timedelta(seconds=2)
dep.status = 'pending'
dep.save()
'''
Update internal datastructures with the newly created inventory update
'''
# Should be only 1 inventory update. The one for the job (task)
latest_inventory_updates = self.get_latest_inventory_update_tasks([task])
self.process_latest_inventory_updates(latest_inventory_updates)
inventory_sources = self.get_inventory_source_tasks([task])
self.process_inventory_sources(inventory_sources)
return dep
inventory_task.created = task.created - timedelta(seconds=2)
inventory_task.status = 'pending'
inventory_task.save()
# inventory_sources = self.get_inventory_source_tasks([task])
# self.process_inventory_sources(inventory_sources)
return inventory_task
def capture_chain_failure_dependencies(self, task, dependencies):
for dep in dependencies:

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

@@ -133,7 +133,7 @@ class DependencyGraph(object):
if type(job) is ProjectUpdate:
self.mark_project_update(job)
elif type(job) is InventoryUpdate:
self.mark_inventory_update(job.inventory_source__inventory_id)
self.mark_inventory_update(job.inventory_source.inventory_id)
self.mark_inventory_source_update(job.inventory_source_id)
elif type(job) is Job:
self.mark_job_template_job(job)