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

Merge pull request #120 from AlanCoding/retry_delete2

Browse Source 
retry to delete inventory in deadlocks
This commit is contained in:
Alan Rominger
2017-07-31 15:10:55 -04:00
committed by GitHub
parent 9c29b0a92f 9d4fd44127
commit e686e07ca7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tasks.py
View File

@@ -409,8 +409,8 @@ def update_host_smart_inventory_memberships():
return return
@task(queue='tower', base=LogErrorsTask) @task(bind=True, queue='tower', base=LogErrorsTask, max_retries=5)
def delete_inventory(inventory_id): def delete_inventory(self, inventory_id):
with ignore_inventory_computed_fields(), \ with ignore_inventory_computed_fields(), \
ignore_inventory_group_removal(): ignore_inventory_group_removal():
try: try:
@@ -421,6 +421,9 @@ def delete_inventory(inventory_id):
{'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'} {'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'}
) )
logger.debug('Deleted inventory: %s' % inventory_id) logger.debug('Deleted inventory: %s' % inventory_id)
except OperationalError:
logger.warning('Database error deleting inventory {}, but will retry.'.format(inventory_id))
self.retry(countdown=10)
except Inventory.DoesNotExist: except Inventory.DoesNotExist:
logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id)) logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id))
return return