Use advisory_lock from DAB (#15676)

* Use advisory_lock from DAB

* Remove the django-pglocks dep

* Re-run updater script

* Move the import in new location
This commit is contained in:
Alan Rominger
2025-01-15 14:06:59 -05:00
committed by GitHub
parent bb8d878a36
commit f57a9863d6
15 changed files with 26 additions and 47 deletions

View File

@@ -4,8 +4,9 @@
from django.db import transaction
from django.core.management.base import BaseCommand, CommandError
from ansible_base.lib.utils.db import advisory_lock
from awx.main.models import Instance
from awx.main.utils.pglock import advisory_lock
class Command(BaseCommand):

View File

@@ -21,6 +21,9 @@ from django.utils.encoding import smart_str
# DRF error class to distinguish license exceptions
from rest_framework.exceptions import PermissionDenied
# django-ansible-base
from ansible_base.lib.utils.db import advisory_lock
# AWX inventory imports
from awx.main.models.inventory import Inventory, InventorySource, InventoryUpdate, Host
from awx.main.utils.mem_inventory import MemInventory, dict_to_mem_data
@@ -32,7 +35,6 @@ from awx.main.utils import ignore_inventory_computed_fields, get_licenser
from awx.main.utils.execution_environments import get_default_execution_environment
from awx.main.signals import disable_activity_stream
from awx.main.constants import STANDARD_INVENTORY_UPDATE_ENV
from awx.main.utils.pglock import advisory_lock
logger = logging.getLogger('awx.main.commands.inventory_import')

View File

@@ -2,7 +2,8 @@
# All Rights Reserved.
import sys
from awx.main.utils.pglock import advisory_lock
from ansible_base.lib.utils.db import advisory_lock
from awx.main.models import Instance, InstanceGroup
from django.core.management.base import BaseCommand, CommandError

View File

@@ -2,7 +2,8 @@
# All Rights Reserved.
import sys
from awx.main.utils.pglock import advisory_lock
from ansible_base.lib.utils.db import advisory_lock
from awx.main.models import InstanceGroup
from django.db import transaction