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

create lock for perform_update

Browse Source 
* perform_update can be called from either awx-manage
  or the RunInventoryUpdate task
* need to make sure that the inventory updates
  that happen with perform_update are atomic
This commit is contained in:
Jim Ladd
2020-10-29 12:27:42 -07:00
committed by Alan Rominger
parent 66bdcee854
commit 9633714c49
1 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -863,6 +863,7 @@ class Command(BaseCommand):
self.inventory_update.save(update_fields=['org_host_limit_error']) self.inventory_update.save(update_fields=['org_host_limit_error'])
def handle(self, *args, **options): def handle(self, *args, **options):
with advisory_lock('inventory_{}_import'.format(self.inventory.id)):
# Load inventory and related objects from database. # Load inventory and related objects from database.
inventory_name = options.get('inventory_name', None) inventory_name = options.get('inventory_name', None)
inventory_id = options.get('inventory_id', None) inventory_id = options.get('inventory_id', None)
@@ -966,7 +967,12 @@ class Command(BaseCommand):
raise CommandError('invalid regular expression for --host-filter') raise CommandError('invalid regular expression for --host-filter')
begin = time.time() begin = time.time()
with advisory_lock('inventory_{}_update'.format(self.inventory.id)):
# Since perform_update can be invoked either through the awx-manage CLI
# or from the task system, we need to create a new lock at this level
# (even though inventory_import.Command.handle -- which calls
# perform_update -- has its own lock, inventory_ID_import)
with advisory_lock('inventory_{}_perform_update'.format(self.inventory.id)):
try: try:
self.check_license() self.check_license()