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

AC-982 Fixes for inventory import speed when deleting groups.

Browse Source
This commit is contained in:
Chris Church
2014-02-04 22:55:44 -05:00
parent 033968a0a9
commit ce56f1c17d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/inventory_import.py
View File

@@ -523,7 +523,7 @@ class Command(NoArgsCommand):
del_groups = del_groups.exclude(name__in=self.all_group.all_groups.keys()) del_groups = del_groups.exclude(name__in=self.all_group.all_groups.keys())
for group in del_groups: for group in del_groups:
group_name = group.name group_name = group.name
group.mark_inactive() group.mark_inactive(recompute=False)
self.logger.info('Group "%s" deleted', group_name) self.logger.info('Group "%s" deleted', group_name)
# If overwrite is set, clear all invalid child relationships for groups # If overwrite is set, clear all invalid child relationships for groups

3
awx/main/signals.py
View File

@@ -143,7 +143,7 @@ def migrate_children_from_deleted_group_to_parent_groups(sender, **kwargs):
except Inventory.DoesNotExist: except Inventory.DoesNotExist:
pass pass
@receiver(pre_save, sender=Group) receiver(pre_save, sender=Group)
def save_related_pks_before_group_marked_inactive(sender, **kwargs): def save_related_pks_before_group_marked_inactive(sender, **kwargs):
if getattr(_inventory_updates, 'is_removing', False): if getattr(_inventory_updates, 'is_removing', False):
return return
@@ -187,6 +187,7 @@ def migrate_children_from_inactive_group_to_parent_groups(sender, **kwargs):
except InventorySource.DoesNotExist: except InventorySource.DoesNotExist:
pass pass
inventory_pk = getattr(instance, '_saved_inventory_pk', None) inventory_pk = getattr(instance, '_saved_inventory_pk', None)
if not getattr(_inventory_updates, 'is_updating', False):
if inventory_pk: if inventory_pk:
try: try:
inventory = Inventory.objects.get(pk=inventory_pk, active=True) inventory = Inventory.objects.get(pk=inventory_pk, active=True)