pulpcore 3.85.28__tar.gz → 3.85.30__tar.gz

{pulpcore-3.85.28 → pulpcore-3.85.30}/CHANGES.md

@@ -8,6 +8,50 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.85.30 (2026-09-01) {: #3.85.30 }
+
+### REST API {: #3.85.30-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.85.30-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.85.30-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.85.30-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.85.29 (2026-08-12) {: #3.85.29 }
+
+### REST API {: #3.85.29-rest-api }
+
+#### Bugfixes {: #3.85.29-rest-api-bugfix }
+
+- Reduced lock contention for distribution updates that leave `base_path` unchanged.
+  [#3322](https://github.com/pulp/pulpcore/issues/3322),
+  [#7896](https://github.com/pulp/pulpcore/issues/7896)
+
+### Plugin API {: #3.85.29-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.85.29-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.85.29-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.85.28 (2026-07-29) {: #3.85.28 }
 
 ### REST API {: #3.85.28-rest-api }

{pulpcore-3.85.28 → pulpcore-3.85.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.85.28
+Version: 3.85.30
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -25,7 +25,7 @@ Requires-Dist: aiohttp<3.15,>=3.8.3
 Requires-Dist: asyncio-throttle<=1.0.2,>=1.0
 Requires-Dist: backoff<2.3,>=2.1.2
 Requires-Dist: click<8.4,>=8.1.0
-Requires-Dist: cryptography<47.0,>=44.0.3
+Requires-Dist: cryptography<51.0,>=44.0.3
 Requires-Dist: Django!=5.0,!=5.1,<5.3,>=4.2.24
 Requires-Dist: django-filter<=25.1,>=23.1
 Requires-Dist: django-guid<3.6,>=3.3.0

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.85.28"
+    version = "3.85.30"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.85.28"
+    version = "3.85.30"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore/app/apps.py

@@ -237,7 +237,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.85.28"
+    version = "3.85.30"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore/app/viewsets/base.py

@@ -449,6 +449,14 @@ class AsyncReservedObjectMixin:
         ).format(self.__class__.__name__)
         return [instance]
 
+    def async_shared_resources(self, instance, **kwargs):
+        """
+        Return shared resources to reserve for the task created by the Async...Mixins.
+
+        This default implementation does not add any shared reservations.
+        """
+        return []
+
 
 class AsyncCreateMixin:
     """
@@ -469,6 +477,7 @@ class AsyncCreateMixin:
         task = dispatch(
             tasks.base.general_create,
             exclusive_resources=self.async_reserved_resources(None),
+            shared_resources=self.async_shared_resources(None),
             args=(app_label, serializer.__class__.__name__),
             kwargs={"data": request.data},
         )
@@ -495,6 +504,7 @@ class AsyncUpdateMixin(AsyncReservedObjectMixin):
         task = dispatch(
             tasks.base.ageneral_update,
             exclusive_resources=self.async_reserved_resources(instance),
+            shared_resources=self.async_shared_resources(instance),
             args=(pk, app_label, serializer.__class__.__name__),
             kwargs={"data": request.data, "partial": partial},
             immediate=self.ALLOW_NON_BLOCKING_UPDATE,
@@ -531,6 +541,7 @@ class AsyncRemoveMixin(AsyncReservedObjectMixin):
         task = dispatch(
             tasks.base.ageneral_delete,
             exclusive_resources=self.async_reserved_resources(instance),
+            shared_resources=self.async_shared_resources(instance),
             args=(pk, app_label, serializer.__class__.__name__),
             immediate=self.ALLOW_NON_BLOCKING_DELETE,
         )

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore/app/viewsets/publication.py

@@ -527,7 +527,31 @@ class BaseDistributionViewSet(NamedModelViewSet):
         return qs
 
     def async_reserved_resources(self, instance):
-        """Return resource that locks all Distributions."""
+        """
+        Reserve safe distribution locks for async operations.
+
+        The explicit distribution.base_path lock protects the domain-wide base_path invariant.
+        The older domain-scoped distributions lock remains shared so tasks queued before an upgrade
+        still overlap safely with new tasks.
+        """
+        distribution_base_path = f"pdrn:{get_domain().pulp_id}:distribution.base_path"
+        if instance is None:
+            return [distribution_base_path]
+
+        if getattr(self, "action", "") == "destroy":
+            return [instance]
+
+        request_data = getattr(getattr(self, "request", None), "data", {})
+        requested_base_path = request_data.get("base_path", instance.base_path)
+        if requested_base_path == instance.base_path:
+            return [instance]
+
+        return [instance, distribution_base_path]
+
+    def async_shared_resources(self, instance):
+        """
+        Keep the legacy domain-scoped distribution lock shared for upgrade compatibility.
+        """
         return [f"pdrn:{get_domain().pulp_id}:distributions"]
 
 
@@ -567,9 +591,9 @@ class DistributionViewSet(
     LabelsMixin,
 ):
     """
-    Provides read and list methods and also provides asynchronous CUD methods to dispatch tasks
-    with reservation that lock all Distributions preventing race conditions during base_path
-    checking.
+    Provides read and list methods plus asynchronous CUD methods that reserve per-distribution
+    locks, an explicit base_path lock when needed, and the legacy domain-wide distributions lock in
+    shared mode for upgrade compatibility.
     """
 
 

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore/tests/functional/api/using_plugin/test_distributions.py

@@ -160,6 +160,81 @@ def test_distribution_base_path(
     assert json.loads(exc.value.body)["base_path"] is not None
 
 
+@pytest.mark.parallel
+def test_distribution_update_task_reservations(
+    file_bindings,
+    monitor_task,
+):
+    def has_shared_distributions_lock(task):
+        return any(
+            resource.startswith("shared:") and resource.endswith(":distributions")
+            for resource in task.reserved_resources_record
+        )
+
+    def has_exclusive_distributions_lock(task):
+        return any(
+            not resource.startswith("shared:") and resource.endswith(":distributions")
+            for resource in task.reserved_resources_record
+        )
+
+    def has_base_path_lock(task):
+        return any(
+            not resource.startswith("shared:") and resource.endswith(":distribution.base_path")
+            for resource in task.reserved_resources_record
+        )
+
+    create_task = monitor_task(
+        file_bindings.DistributionsFileApi.create(
+            {"name": str(uuid4()), "base_path": str(uuid4())}
+        ).task
+    )
+    assert has_base_path_lock(create_task)
+    assert has_shared_distributions_lock(create_task)
+    assert not has_exclusive_distributions_lock(create_task)
+    distribution = file_bindings.DistributionsFileApi.read(create_task.created_resources[0])
+    assert distribution.prn not in create_task.reserved_resources_record
+
+    no_base_path_update_task = monitor_task(
+        file_bindings.DistributionsFileApi.partial_update(
+            distribution.pulp_href,
+            {"name": str(uuid4())},
+        ).task
+    )
+    assert distribution.prn in no_base_path_update_task.reserved_resources_record
+    assert not has_base_path_lock(no_base_path_update_task)
+    assert has_shared_distributions_lock(no_base_path_update_task)
+    assert not has_exclusive_distributions_lock(no_base_path_update_task)
+
+    unchanged_base_path_update_task = monitor_task(
+        file_bindings.DistributionsFileApi.partial_update(
+            distribution.pulp_href,
+            {"name": str(uuid4()), "base_path": distribution.base_path},
+        ).task
+    )
+    assert distribution.prn in unchanged_base_path_update_task.reserved_resources_record
+    assert not has_base_path_lock(unchanged_base_path_update_task)
+    assert has_shared_distributions_lock(unchanged_base_path_update_task)
+    assert not has_exclusive_distributions_lock(unchanged_base_path_update_task)
+
+    base_path_update_task = monitor_task(
+        file_bindings.DistributionsFileApi.partial_update(
+            distribution.pulp_href, {"base_path": str(uuid4())}
+        ).task
+    )
+    assert distribution.prn in base_path_update_task.reserved_resources_record
+    assert has_base_path_lock(base_path_update_task)
+    assert has_shared_distributions_lock(base_path_update_task)
+    assert not has_exclusive_distributions_lock(base_path_update_task)
+
+    delete_task = monitor_task(
+        file_bindings.DistributionsFileApi.delete(distribution.pulp_href).task
+    )
+    assert distribution.prn in delete_task.reserved_resources_record
+    assert not has_base_path_lock(delete_task)
+    assert has_shared_distributions_lock(delete_task)
+    assert not has_exclusive_distributions_lock(delete_task)
+
+
 @pytest.mark.parallel
 def test_distribution_filtering(
     file_bindings,

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.85.28
+Version: 3.85.30
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -25,7 +25,7 @@ Requires-Dist: aiohttp<3.15,>=3.8.3
 Requires-Dist: asyncio-throttle<=1.0.2,>=1.0
 Requires-Dist: backoff<2.3,>=2.1.2
 Requires-Dist: click<8.4,>=8.1.0
-Requires-Dist: cryptography<47.0,>=44.0.3
+Requires-Dist: cryptography<51.0,>=44.0.3
 Requires-Dist: Django!=5.0,!=5.1,<5.3,>=4.2.24
 Requires-Dist: django-filter<=25.1,>=23.1
 Requires-Dist: django-guid<3.6,>=3.3.0

{pulpcore-3.85.28 → pulpcore-3.85.30}/pulpcore.egg-info/requires.txt

@@ -4,7 +4,7 @@ aiohttp<3.15,>=3.8.3
 asyncio-throttle<=1.0.2,>=1.0
 backoff<2.3,>=2.1.2
 click<8.4,>=8.1.0
-cryptography<47.0,>=44.0.3
+cryptography<51.0,>=44.0.3
 Django!=5.0,!=5.1,<5.3,>=4.2.24
 django-filter<=25.1,>=23.1
 django-guid<3.6,>=3.3.0

{pulpcore-3.85.28 → pulpcore-3.85.30}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.85.28"
+version = "3.85.30"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -31,7 +31,7 @@ dependencies = [
   "asyncio-throttle>=1.0,<=1.0.2",  # Unsure about versioning, but not released often anyway.
   "backoff>=2.1.2,<2.3",  # Looks like only bugfixes in z-Stream.
   "click>=8.1.0,<8.4",  # Uses milestone.feature.fix https://palletsprojects.com/versions .
-  "cryptography>=44.0.3,<47.0",  # SemVer compatible https://cryptography.io/en/latest/api-stability/#versioning .
+  "cryptography>=44.0.3,<51.0",  # SemVer compatible https://cryptography.io/en/latest/api-stability/#versioning .
   "Django>=4.2.24,<5.3, !=5.0, !=5.1",  # LTS version, switch only if we have a compelling reason to".
   "django-filter>=23.1,<=25.1",  # Looks like CalVer.
   "django-guid>=3.3.0,<3.6",  # Looks like only bugfixes in z-Stream.
@@ -206,7 +206,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.85.28"
+current_version = "3.85.30"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"

{pulpcore-3.85.28 → pulpcore-3.85.30}/unittest_requirements.txt

@@ -2,7 +2,7 @@
 mock
 aiotools
 pytest<8
-pytest-django
+pytest-django[django]
 pytest-asyncio
 pytest-aiohttp
 pytest-redis<3.1.0 # https://github.com/ClearcodeHQ/pytest-redis/issues/679