Refactor the repository retrieval in get_dr_push

closes pulp#1275
closes pulp#489

CHANGES/1275.misc

@@ -0,0 +1,2 @@
+Ensured repositories are correctly retrieved or initialized when handling client's parallel blob
+uploading.

CHANGES/489.misc

@@ -0,0 +1 @@
+Refactored ``get_dr_push()`` to be more readable.

pulp_container/app/registry_api.py

@@ -25,14 +25,13 @@
 from pulpcore.plugin.models import Artifact, ContentArtifact, UploadChunk
 from pulpcore.plugin.files import PulpTemporaryUploadedFile
 from pulpcore.plugin.tasking import add_and_remove, dispatch
-from pulpcore.plugin.util import get_objects_for_user
+from pulpcore.plugin.util import get_objects_for_user, get_url
 from rest_framework.exceptions import (
     AuthenticationFailed,
     NotAuthenticated,
     PermissionDenied,
     ParseError,
     Throttled,
-    ValidationError,
 )
 from rest_framework.generics import ListAPIView
 from rest_framework.pagination import BasePagination
@@ -291,32 +290,7 @@ def get_dr_push(self, request, path, create=False):
             distribution = models.ContainerDistribution.objects.get(base_path=path)
         except models.ContainerDistribution.DoesNotExist:
             if create:
-                try:
-                    with transaction.atomic():
-                        repo_serializer = serializers.ContainerPushRepositorySerializer(
-                            data={"name": path}, context={"request": request}
-                        )
-                        repo_serializer.is_valid(raise_exception=True)
-                        repository = repo_serializer.create(repo_serializer.validated_data)
-                        repo_href = serializers.ContainerPushRepositorySerializer(
-                            repository, context={"request": request}
-                        ).data["pulp_href"]
-
-                        dist_serializer = serializers.ContainerDistributionSerializer(
-                            data={"base_path": path, "name": path, "repository": repo_href}
-                        )
-                        dist_serializer.is_valid(raise_exception=True)
-                        distribution = dist_serializer.create(dist_serializer.validated_data)
-                except ValidationError:
-                    raise RepositoryInvalid(name=path)
-                except IntegrityError:
-                    # Seems like another process created our stuff already. Retry fetching it.
-                    distribution = models.ContainerDistribution.objects.get(base_path=path)
-                    repository = distribution.repository
-                    if repository:
-                        repository = repository.cast()
-                        if not repository.PUSH_ENABLED:
-                            raise RepositoryInvalid(name=path, message="Repository is read-only.")
+                distribution, repository = self.create_dr(path, request)
             else:
                 raise RepositoryNotFound(name=path)
         else:
@@ -326,29 +300,33 @@ def get_dr_push(self, request, path, create=False):
                 if not repository.PUSH_ENABLED:
                     raise RepositoryInvalid(name=path, message="Repository is read-only.")
             elif create:
-                try:
-                    with transaction.atomic():
-                        repo_serializer = serializers.ContainerPushRepositorySerializer(
-                            data={"name": path}, context={"request": request}
-                        )
-                        repo_serializer.is_valid(raise_exception=True)
-                        repository = repo_serializer.create(repo_serializer.validated_data)
-                        distribution.repository = repository
-                        distribution.save()
-                except IntegrityError:
-                    # Seems like another process created our stuff already. Retry fetching it.
-                    distribution = models.ContainerDistribution.objects.get(pk=distribution.pk)
-                    repository = distribution.repository
-                    if repository:
-                        repository = repository.cast()
-                        if not repository.PUSH_ENABLED:
-                            raise RepositoryInvalid(name=path, message="Repository is read-only.")
-                    else:
-                        raise RepositoryNotFound(name=path)
+                with transaction.atomic():
+                    repository = serializers.ContainerPushRepositorySerializer.get_or_create(
+                        {"name": path}
+                    )
+                    distribution.repository = repository
+                    distribution.save()
             else:
                 raise RepositoryNotFound(name=path)
         return distribution, repository
 
+    def create_dr(self, path, request):
+        with transaction.atomic():
+            repository = serializers.ContainerPushRepositorySerializer.get_or_create({"name": path})
+            distribution = serializers.ContainerDistributionSerializer.get_or_create(
+                {"base_path": path, "name": path}, {"repository": get_url(repository)}
+            )
+
+            if distribution.repository:
+                dist_repository = distribution.repository.cast()
+                if not dist_repository.PUSH_ENABLED or repository != dist_repository:
+                    raise RepositoryInvalid(name=path, message="Repository is read-only.")
+            else:
+                distribution.repository = repository
+                distribution.save()
+
+        return distribution, repository
+
 
 class BearerTokenView(APIView):
     """

pulp_container/app/serializers.py

@@ -196,7 +196,7 @@ class Meta:
         model = models.ContainerRepository
 
 
-class ContainerPushRepositorySerializer(RepositorySerializer):
+class ContainerPushRepositorySerializer(RepositorySerializer, GetOrCreateSerializerMixin):
     """
     Serializer for Container Push Repositories.
     """
@@ -277,7 +277,7 @@ class Meta:
         model = models.ContainerRemote
 
 
-class ContainerDistributionSerializer(DistributionSerializer):
+class ContainerDistributionSerializer(DistributionSerializer, GetOrCreateSerializerMixin):
     """
     A serializer for ContainerDistribution.
     """

requirements.txt

@@ -1,5 +1,5 @@
 ecdsa>=0.14,<=0.18.0
 jsonschema>=4.4,<4.20
-pulpcore>=3.40.1,<3.55
+pulpcore>=3.40.3,<3.55
 pyjwkest>=1.4,<=1.4.2
 pyjwt[crypto]>=2.4,<2.9