External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

optimize a slow query in inventory script generation

Browse Source 
if we don't preload this column, Django needs it, and so it generates
one query per-host (!!!) to get it.  For large (10k+ host) inventories,
this is incredibly slow.

see: https://github.com/ansible/awx/issues/3214
This commit is contained in:
Ryan Petrello
2019-02-12 11:36:44 -05:00
parent 570283fba2
commit e245e50ee4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/inventory.py
View File

@@ -239,7 +239,7 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
hosts_kw = dict() hosts_kw = dict()
if not show_all: if not show_all:
hosts_kw['enabled'] = True hosts_kw['enabled'] = True
fetch_fields = ['name', 'id', 'variables'] fetch_fields = ['name', 'id', 'variables', 'inventory_id']
if towervars: if towervars:
fetch_fields.append('enabled') fetch_fields.append('enabled')
hosts = self.hosts.filter(**hosts_kw).order_by('name').only(*fetch_fields) hosts = self.hosts.filter(**hosts_kw).order_by('name').only(*fetch_fields)

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

@@ -805,7 +805,10 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
def get_notification_friendly_name(self): def get_notification_friendly_name(self):
return "Job" return "Job"
def _get_inventory_hosts(self, only=['name', 'ansible_facts', 'ansible_facts_modified', 'modified',]): def _get_inventory_hosts(
self,
only=['name', 'ansible_facts', 'ansible_facts_modified', 'modified', 'inventory_id']
):
if not self.inventory: if not self.inventory:
return [] return []
return self.inventory.hosts.only(*only) return self.inventory.hosts.only(*only)