NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-23 07:56:44 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

12336 switch to pg locks

Browse Source
This commit is contained in:
Arthur 2023-10-05 10:38:24 -07:00
parent e038e6ac40
commit b1d8acd722
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/dcim/api/views.py
View File

@ -1,6 +1,6 @@
from django.db import transaction
from django.http import Http404, HttpResponse from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django_pglocks import advisory_lock
from drf_spectacular.types import OpenApiTypes from drf_spectacular.types import OpenApiTypes
from drf_spectacular.utils import extend_schema, OpenApiParameter from drf_spectacular.utils import extend_schema, OpenApiParameter
from rest_framework.decorators import action from rest_framework.decorators import action
@ -23,7 +23,7 @@ from netbox.api.pagination import StripCountAnnotationsPaginator
from netbox.api.renderers import TextRenderer from netbox.api.renderers import TextRenderer
from netbox.api.viewsets import NetBoxModelViewSet from netbox.api.viewsets import NetBoxModelViewSet
from netbox.api.viewsets.mixins import SequentialBulkCreatesMixin from netbox.api.viewsets.mixins import SequentialBulkCreatesMixin
from netbox.constants import NESTED_SERIALIZER_PREFIX from netbox.constants import NESTED_SERIALIZER_PREFIX, ADVISORY_LOCK_KEYS
from utilities.api import get_serializer_for_model from utilities.api import get_serializer_for_model
from utilities.utils import count_related from utilities.utils import count_related
from virtualization.models import VirtualMachine from virtualization.models import VirtualMachine
@ -110,15 +110,15 @@ class RegionViewSet(NetBoxModelViewSet):
serializer_class = serializers.RegionSerializer serializer_class = serializers.RegionSerializer
filterset_class = filtersets.RegionFilterSet filterset_class = filtersets.RegionFilterSet
@transaction.atomic @advisory_lock(ADVISORY_LOCK_KEYS['regions'])
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
return super().create(request, *args, **kwargs) return super().create(request, *args, **kwargs)
@transaction.atomic @advisory_lock(ADVISORY_LOCK_KEYS['regions'])
def update(self, request, *args, **kwargs): def update(self, request, *args, **kwargs):
return super().update(request, *args, **kwargs) return super().update(request, *args, **kwargs)
@transaction.atomic @advisory_lock(ADVISORY_LOCK_KEYS['regions'])
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
return super().destroy(request, *args, **kwargs) return super().destroy(request, *args, **kwargs)

1
netbox/netbox/constants.py
View File

@ -15,4 +15,5 @@ ADVISORY_LOCK_KEYS = {
'available-ips': 100200, 'available-ips': 100200,
'available-vlans': 100300, 'available-vlans': 100300,
'available-asns': 100400, 'available-asns': 100400,
'regions': 100500,
} }