pulpcore 3.111.0__tar.gz → 3.111.2__tar.gz

{pulpcore-3.111.0 → pulpcore-3.111.2}/CHANGES.md

@@ -8,6 +8,52 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.111.2 (2026-05-19) {: #3.111.2 }
+
+### REST API {: #3.111.2-rest-api }
+
+#### Bugfixes {: #3.111.2-rest-api-bugfix }
+
+- Fixed a bug where immediate tasks could be executed even if they were blocked by other tasks using the same resources.
+
+### Plugin API {: #3.111.2-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.111.2-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.111.2-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.111.1 (2026-05-14) {: #3.111.1 }
+
+### REST API {: #3.111.1-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.111.1-plugin-api }
+
+#### Bugfixes {: #3.111.1-plugin-api-bugfix }
+
+- Removed the `default=True` from the `overwrite` field on `NoArtifactContentSerializer` so it no
+  longer leaks into `validated_data`. This fixes plugins that splat content serializer data
+  (`**serializer.validated_data`).
+
+### Pulp File {: #3.111.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.111.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.111.0 (2026-05-13) {: #3.111.0 }
 
 ### REST API {: #3.111.0-rest-api }

{pulpcore-3.111.0 → pulpcore-3.111.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.111.0
+Version: 3.111.2
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulp_certguard/app/__init__.py

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

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulp_file/app/__init__.py

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

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulpcore/app/apps.py

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

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulpcore/app/serializers/content.py

@@ -35,7 +35,6 @@ class NoArtifactContentSerializer(base.ModelSerializer):
     )
     overwrite = serializers.BooleanField(
         required=False,
-        default=True,
         write_only=True,
         help_text=_(
             "When set to true, existing content in the repository with the same unique key "

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulpcore/tasking/redis_tasks.py

@@ -13,7 +13,7 @@ from asgiref.sync import sync_to_async
 
 from pulpcore.app.models import AppStatus, Task, TaskGroup
 from pulpcore.app.redis_connection import get_redis_connection
-from pulpcore.constants import TASK_FINAL_STATES, TASK_STATES
+from pulpcore.constants import TASK_FINAL_STATES, TASK_INCOMPLETE_STATES, TASK_STATES
 from pulpcore.tasking.redis_locks import (
     acquire_locks,
     async_safe_release_task_locks,
@@ -198,20 +198,33 @@ async def aexecute_task(task):
             _logger.debug("Task %s releasing all locks in finally block (async)", task.pk)
 
 
-def are_resources_available(task: Task, app_lock) -> bool:
+def are_resources_available(task: Task, colliding_resources, app_lock) -> bool:
     """
     Atomically try to acquire task lock and resource locks for immediate task.
 
     Resource conflicts are handled by Redis lock acquisition - if another task
     holds conflicting resource locks, acquire_locks() will fail atomically.
 
+    If any earlier task exists that uses a conflicting resource lock then return False.
+    Otherwise, try to acquire the locks and return True if successful.
+
     Args:
         task: The task to acquire locks for.
+        colliding_resources: The list of resources that can't be taken by other tasks.
         app_lock: The current AppStatus instance.
 
     Returns:
         bool: True if all locks were acquired, False otherwise.
     """
+    prior_tasks = Task.objects.filter(
+        state__in=TASK_INCOMPLETE_STATES, pulp_created__lt=task.pulp_created
+    )
+    colliding_resources_taken = prior_tasks.filter(
+        reserved_resources_record__overlap=colliding_resources
+    ).exists()
+    if colliding_resources_taken:
+        return False
+
     redis_conn = get_redis_connection()
 
     # Extract resources from task
@@ -249,20 +262,33 @@ def are_resources_available(task: Task, app_lock) -> bool:
         return False
 
 
-async def async_are_resources_available(task: Task, app_lock) -> bool:
+async def async_are_resources_available(task: Task, colliding_resources, app_lock) -> bool:
     """
     Atomically try to acquire task lock and resource locks for immediate task (async version).
 
     Resource conflicts are handled by Redis lock acquisition - if another task
     holds conflicting resource locks, acquire_locks() will fail atomically.
 
+    If any earlier task exists that uses a conflicting resource lock then return False.
+    Otherwise, try to acquire the locks and return True if successful.
+
     Args:
         task: The task to acquire locks for.
+        colliding_resources: The list of resources that can't be taken by other tasks.
         app_lock: The current AppStatus instance.
 
     Returns:
         bool: True if all locks were acquired, False otherwise.
     """
+    prior_tasks = Task.objects.filter(
+        state__in=TASK_INCOMPLETE_STATES, pulp_created__lt=task.pulp_created
+    )
+    colliding_resources_taken = await prior_tasks.filter(
+        reserved_resources_record__overlap=colliding_resources
+    ).aexists()
+    if colliding_resources_taken:
+        return False
+
     redis_conn = get_redis_connection()
 
     # Extract resources from task
@@ -344,7 +370,7 @@ def dispatch(
     assert deferred or immediate, "A task must be at least `deferred` or `immediate`."
     function_name = get_function_name(func)
     versions = get_version(versions, function_name)
-    _, resources = get_resources(exclusive_resources, shared_resources, immediate)
+    colliding_resources, resources = get_resources(exclusive_resources, shared_resources, immediate)
     app_lock = None if not execute_now else AppStatus.objects.current()  # Lazy evaluation...
     task_payload = get_task_payload(
         function_name, task_group, args, kwargs, resources, versions, immediate, deferred, app_lock
@@ -353,7 +379,7 @@ def dispatch(
     if execute_now:
         # Try to atomically acquire task lock and resource locks
         # are_resources_available() now acquires ALL locks atomically
-        if are_resources_available(task, app_lock):
+        if are_resources_available(task, colliding_resources, app_lock):
             # All locks acquired successfully
             # Proceed with execution
             current_app = app_lock
@@ -396,7 +422,7 @@ async def adispatch(
     assert deferred or immediate, "A task must be at least `deferred` or `immediate`."
     function_name = get_function_name(func)
     versions = get_version(versions, function_name)
-    _, resources = get_resources(exclusive_resources, shared_resources, immediate)
+    colliding_resources, resources = get_resources(exclusive_resources, shared_resources, immediate)
     app_lock = None if not execute_now else AppStatus.objects.current()  # Lazy evaluation...
     task_payload = get_task_payload(
         function_name, task_group, args, kwargs, resources, versions, immediate, deferred, app_lock
@@ -405,7 +431,7 @@ async def adispatch(
     if execute_now:
         # Try to atomically acquire task lock and resource locks
         # async_are_resources_available() now acquires ALL locks atomically
-        if await async_are_resources_available(task, app_lock):
+        if await async_are_resources_available(task, colliding_resources, app_lock):
             # All locks acquired successfully
             # Proceed with execution
             current_app = app_lock

{pulpcore-3.111.0 → pulpcore-3.111.2}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.111.0
+Version: 3.111.2
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.111.0 → pulpcore-3.111.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.111.0"
+version = "3.111.2"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -207,7 +207,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.111.0"
+current_version = "3.111.2"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"