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

Merge pull request #6722 from AlanCoding/atomic_inv_del

Browse Source 
use atomic transaction to delete inventory in task
This commit is contained in:
Alan Rominger
2017-06-26 11:07:21 -04:00
committed by GitHub
parent 2c98294035 cf751568b5
commit 7699e26336
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/tasks.py
View File

@@ -358,14 +358,15 @@ def update_host_smart_inventory_memberships():
@task(queue='tower') @task(queue='tower')
def delete_inventory(inventory_id): def delete_inventory(inventory_id):
i = Inventory.objects.filter(id=inventory_id)
if not i.exists():
logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id))
return
i = i[0]
with ignore_inventory_computed_fields(), \ with ignore_inventory_computed_fields(), \
ignore_inventory_group_removal(): ignore_inventory_group_removal():
i.delete() with transaction.atomic():
try:
i = Inventory.objects.get(id=inventory_id)
except Inventory.DoesNotExist:
logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id))
return
i.delete()
emit_channel_notification( emit_channel_notification(
'inventories-status_changed', 'inventories-status_changed',
{'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'} {'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'}