Merge pull request #6459 from chrismeyersfsu/fix-register_queue_race2

fix register_queue race conditionn

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx/main/management/commands/register_queue.py

@@ -6,6 +6,7 @@ from awx.main.utils.pglock import advisory_lock
 from awx.main.models import Instance, InstanceGroup
 
 from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
 
 
 class InstanceNotFound(Exception):
@@ -97,7 +98,8 @@ class Command(BaseCommand):
         if options.get('hostnames'):
             hostname_list = options.get('hostnames').split(",")
 
-        with advisory_lock('instance_group_registration'):
+        with advisory_lock('cluster_policy_lock'):
+            with transaction.atomic():
                 changed2 = False
                 changed3 = False
                 (ig, created, changed1) = self.get_create_update_instance_group(queuename, inst_per, inst_min)