pulpcore 3.88.0__tar.gz → 3.89.0__tar.gz

{pulpcore-3.88.0 → pulpcore-3.89.0}/CHANGES.md

@@ -8,6 +8,28 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.89.0 (2025-09-09) {: #3.89.0 }
+
+### REST API {: #3.89.0-rest-api }
+
+#### Features {: #3.89.0-rest-api-feature }
+
+- Stop using advisory locks in favor of a database column for locking on tasks.
+
+### Plugin API {: #3.89.0-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.89.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.89.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.88.0 (2025-09-03) {: #3.88.0 }
 
 ### REST API {: #3.88.0-rest-api }
@@ -19,7 +41,7 @@
 
 #### Bugfixes {: #3.88.0-rest-api-bugfix }
 
-- Fixed error case where worker tried to aquire the app_lock for a Task that was already finished.
+- Fixed error case where worker tried to aquire the app lock for a Task that was already finished.
   [#6899](https://github.com/pulp/pulpcore/issues/6899)
 
 ### Plugin API {: #3.88.0-plugin-api }
@@ -43,6 +65,29 @@ No significant changes.
 
 ---
 
+## 3.87.1 (2025-09-03) {: #3.87.1 }
+
+### REST API {: #3.87.1-rest-api }
+
+#### Bugfixes {: #3.87.1-rest-api-bugfix }
+
+- Fixed error case where worker tried to aquire the app lock for a Task that was already finished.
+  [#6899](https://github.com/pulp/pulpcore/issues/6899)
+
+### Plugin API {: #3.87.1-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.87.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.87.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.87.0 (2025-08-29) {: #3.87.0 }
 
 ### REST API {: #3.87.0-rest-api }
@@ -72,7 +117,7 @@ No significant changes.
 
 #### Features {: #3.86.0-rest-api-feature }
 
-- Added a configurable bucket boundary for API request duration metric using the OTEL_PULP_API_HISTOGRAM_BUCKETS setting.
+- Added a configurable bucket boundary for API request duration metric using the `OTEL_PULP_API_HISTOGRAM_BUCKETS` setting.
   [#6845](https://github.com/pulp/pulpcore/issues/6845)
 
 #### Bugfixes {: #3.86.0-rest-api-bugfix }
@@ -85,7 +130,7 @@ No significant changes.
 
 #### Improved Documentation {: #3.86.0-rest-api-doc }
 
-- Updated documentation for the TASK_DIAGNOSTICS setting.
+- Updated documentation for the `TASK_DIAGNOSTICS` setting.
   [#6854](https://github.com/pulp/pulpcore/issues/6854)
 
 ### Plugin API {: #3.86.0-plugin-api }

{pulpcore-3.88.0 → pulpcore-3.89.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.88.0
+Version: 3.89.0
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -46,7 +46,7 @@ Requires-Dist: opentelemetry-api<1.37,>=1.27.0
 Requires-Dist: opentelemetry-sdk<1.37,>=1.27.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.37,>=1.27.0
 Requires-Dist: protobuf<7.0,>=4.21.1
-Requires-Dist: pulp-glue<0.36,>=0.28.0
+Requires-Dist: pulp-glue<0.37,>=0.28.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
 Requires-Dist: psycopg[binary]<3.3,>=3.1.8
 Requires-Dist: pyparsing<3.3,>=3.1.0

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulp_certguard/app/__init__.py

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

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulp_file/app/__init__.py

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

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulpcore/app/apps.py

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

pulpcore-3.89.0/pulpcore/app/migrations/0143_require_app_lock_zdu.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.2.23 on 2025-09-04 08:58
+
+from django.db import migrations
+from pulpcore.migrations import RequireVersion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0142_task_result"),
+    ]
+
+    operations = [
+        RequireVersion("core", "3.87"),
+    ]

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulpcore/app/models/task.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from django.contrib.postgres.fields import ArrayField, HStoreField
 from django.contrib.postgres.indexes import GinIndex
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db import connection, models
+from django.db import models
 from django.utils import timezone
 from django_lifecycle import hook, AFTER_CREATE
 
@@ -21,10 +21,10 @@ from pulpcore.app.models import (
     BaseModel,
     GenericRelationModel,
 )
-from pulpcore.app.models.status import BaseAppStatus
+from pulpcore.app.models.status import AppStatus, BaseAppStatus
 from pulpcore.app.models.fields import EncryptedJSONField
 from pulpcore.constants import TASK_CHOICES, TASK_INCOMPLETE_STATES, TASK_STATES
-from pulpcore.exceptions import AdvisoryLockError, exception_to_dict
+from pulpcore.exceptions import exception_to_dict
 from pulpcore.app.util import get_domain_pk, current_task
 from pulpcore.app.loggers import deprecation_logger
 
@@ -141,7 +141,7 @@ class Task(BaseModel, AutoAddObjPermsMixin):
     enc_kwargs = EncryptedJSONField(null=True, encoder=DjangoJSONEncoder)
 
     worker = models.ForeignKey("Worker", null=True, related_name="tasks", on_delete=models.SET_NULL)
-    # This field is supposed to replace the session advisory locks to protect tasks.
+    # This field is the lock to protect tasks.
     app_lock = models.ForeignKey(
         "AppStatus", null=True, related_name="tasks", on_delete=models.SET_NULL
     )
@@ -167,22 +167,6 @@ class Task(BaseModel, AutoAddObjPermsMixin):
     def __str__(self):
         return "Task: {name} [{state}]".format(name=self.name, state=self.state)
 
-    def __enter__(self):
-        self.lock = _uuid_to_advisory_lock(self.pk.int)
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT pg_try_advisory_lock(%s)", [self.lock])
-            acquired = cursor.fetchone()[0]
-        if not acquired:
-            raise AdvisoryLockError("Could not acquire lock.")
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT pg_advisory_unlock(%s)", [self.lock])
-            released = cursor.fetchone()[0]
-        if not released:
-            raise RuntimeError("Lock not held.")
-
     @staticmethod
     def current_id():
         """
@@ -218,7 +202,11 @@ class Task(BaseModel, AutoAddObjPermsMixin):
         This updates the :attr:`started_at` and sets the :attr:`state` to :attr:`RUNNING`.
         """
         started_at = timezone.now()
-        rows = Task.objects.filter(pk=self.pk, state=TASK_STATES.WAITING).update(
+        rows = Task.objects.filter(
+            pk=self.pk,
+            state=TASK_STATES.WAITING,
+            app_lock=AppStatus.objects.current(),
+        ).update(
             state=TASK_STATES.RUNNING,
             started_at=started_at,
         )
@@ -254,7 +242,11 @@ class Task(BaseModel, AutoAddObjPermsMixin):
         # Only set the state to finished if it's running. This is important for when the task has
         # been canceled, so we don't move the task from canceled to finished.
         finished_at = timezone.now()
-        rows = Task.objects.filter(pk=self.pk, state=TASK_STATES.RUNNING).update(
+        rows = Task.objects.filter(
+            pk=self.pk,
+            state=TASK_STATES.RUNNING,
+            app_lock=AppStatus.objects.current(),
+        ).update(
             state=TASK_STATES.COMPLETED,
             finished_at=finished_at,
             result=result,
@@ -289,7 +281,11 @@ class Task(BaseModel, AutoAddObjPermsMixin):
         finished_at = timezone.now()
         tb_str = "".join(traceback.format_tb(tb))
         error = exception_to_dict(exc, tb_str)
-        rows = Task.objects.filter(pk=self.pk, state=TASK_STATES.RUNNING).update(
+        rows = Task.objects.filter(
+            pk=self.pk,
+            state=TASK_STATES.RUNNING,
+            app_lock=AppStatus.objects.current(),
+        ).update(
             state=TASK_STATES.FAILED,
             finished_at=finished_at,
             error=error,
@@ -336,7 +332,11 @@ class Task(BaseModel, AutoAddObjPermsMixin):
         task_data = {}
         if reason:
             task_data["error"] = {"reason": reason}
-        rows = Task.objects.filter(pk=self.pk, state=TASK_STATES.CANCELING).update(
+        rows = Task.objects.filter(
+            pk=self.pk,
+            state=TASK_STATES.CANCELING,
+            app_lock=AppStatus.objects.current(),
+        ).update(
             state=final_state,
             finished_at=finished_at,
             **task_data,

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulpcore/app/settings.py

@@ -216,8 +216,6 @@ TIME_ZONE = "UTC"
 
 USE_I18N = "USE_I18N", True
 
-USE_L10N = True
-
 USE_TZ = True
 
 

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulpcore/content/handler.py

@@ -7,6 +7,7 @@ import socket
 import struct
 from gettext import gettext as _
 from datetime import datetime, timedelta
+from datetime import timezone as dt_timezone
 
 from aiohttp.client_exceptions import ClientResponseError, ClientConnectionError
 from aiohttp.web import FileResponse, StreamResponse, HTTPOk
@@ -115,7 +116,7 @@ class DistroListings(HTTPOk):
         if path == "":
             path = settings.CONTENT_PATH_PREFIX
         html = Handler.render_html(directory_list, path=path)
-        super().__init__(body=html, headers={"Content-Type": "text/html"})
+        super().__init__(text=html, headers={"Content-Type": "text/html"})
 
 
 class CheckpointListings(HTTPOk):
@@ -137,7 +138,7 @@ class CheckpointListings(HTTPOk):
         dates = {f"{Handler._format_checkpoint_timestamp(s)}/": s for s in checkpoints}
         directory_list = dates.keys()
         html = Handler.render_html(directory_list, dates=dates, path=path)
-        super().__init__(body=html, headers={"Content-Type": "text/html"})
+        super().__init__(text=html, headers={"Content-Type": "text/html"})
 
 
 class ArtifactNotFound(Exception):
@@ -439,9 +440,9 @@ class Handler:
         else:
             raise PathNotResolved(path)
 
-        request_timestamp = request_timestamp.replace(tzinfo=timezone.utc)
+        request_timestamp = request_timestamp.replace(tzinfo=dt_timezone.utc)
         # Future timestamps are not allowed for checkpoints
-        if request_timestamp > datetime.now(tz=timezone.utc):
+        if request_timestamp > datetime.now(tz=dt_timezone.utc):
             raise PathNotResolved(path)
         # The timestamp is truncated to seconds, so we need to cover the whole second
         request_timestamp = request_timestamp.replace(microsecond=999999)
@@ -787,7 +788,7 @@ class Handler:
                 elif dir_list:
                     return HTTPOk(
                         headers={"Content-Type": "text/html"},
-                        body=self.render_html(
+                        text=self.render_html(
                             dir_list, path=request.path, dates=dates, sizes=sizes
                         ),
                     )
@@ -862,7 +863,7 @@ class Handler:
                 elif dir_list:
                     return HTTPOk(
                         headers={"Content-Type": "text/html"},
-                        body=self.render_html(
+                        text=self.render_html(
                             dir_list, path=request.path, dates=dates, sizes=sizes
                         ),
                     )

{pulpcore-3.88.0 → pulpcore-3.89.0}/pulpcore/tasking/tasks.py

@@ -1,5 +1,4 @@
 import asyncio
-import contextlib
 import contextvars
 import importlib
 import logging
@@ -11,7 +10,7 @@ import threading
 from gettext import gettext as _
 
 from django.conf import settings
-from django.db import connection, transaction
+from django.db import connection
 from django.db.models import Model
 from django_guid import get_guid
 from pulpcore.app.apps import MODULE_PLUGIN_VERSIONS
@@ -26,6 +25,7 @@ from pulpcore.constants import (
     TASK_INCOMPLETE_STATES,
     TASK_STATES,
     IMMEDIATE_TIMEOUT,
+    TASK_WAKEUP_HANDLE,
     TASK_WAKEUP_UNBLOCK,
 )
 from pulpcore.middleware import x_task_diagnostics_var
@@ -49,7 +49,7 @@ def _validate_and_get_resources(resources):
     return list(resource_set)
 
 
-def wakeup_worker(reason="unknown"):
+def wakeup_worker(reason):
     # Notify workers
     with connection.connection.cursor() as cursor:
         cursor.execute("SELECT pg_notify('pulp_worker_wakeup', %s)", (reason,))
@@ -222,67 +222,61 @@ def dispatch(
     resources = exclusive_resources + [f"shared:{resource}" for resource in shared_resources]
 
     notify_workers = False
-    with contextlib.ExitStack() as stack:
-        with transaction.atomic():
-            task = Task.objects.create(
-                state=TASK_STATES.WAITING,
-                logging_cid=(get_guid()),
-                task_group=task_group,
-                name=function_name,
-                enc_args=args,
-                enc_kwargs=kwargs,
-                parent_task=Task.current(),
-                reserved_resources_record=resources,
-                versions=versions,
-                immediate=immediate,
-                deferred=deferred,
-                profile_options=x_task_diagnostics_var.get(None),
-                app_lock=(immediate and AppStatus.objects.current()) or None,
-            )
-            task.refresh_from_db()  # The database may have assigned a timestamp for us.
-            if immediate:
-                # Grab the advisory lock before the task hits the db.
-                stack.enter_context(task)
-            else:
-                notify_workers = True
-        if immediate:
-            prior_tasks = Task.objects.filter(
-                state__in=TASK_INCOMPLETE_STATES, pulp_created__lt=task.pulp_created
-            )
-            # Compile a list of resources that must not be taken by other tasks.
-            colliding_resources = (
-                shared_resources
-                + exclusive_resources
-                + [f"shared:{resource}" for resource in exclusive_resources]
-            )
-            # Can we execute this task immediately?
-            if (
-                not colliding_resources
-                or not prior_tasks.filter(
-                    reserved_resources_record__overlap=colliding_resources
-                ).exists()
-            ):
-                task.unblock()
-
-                cur_dir = os.getcwd()
-                with tempfile.TemporaryDirectory(dir=settings.WORKING_DIRECTORY) as working_dir:
-                    os.chdir(working_dir)
-                    try:
-                        execute_task(task)
-                    finally:
-                        # Whether the task fails or not, we should always restore the workdir.
-                        os.chdir(cur_dir)
-
-                if resources:
-                    notify_workers = True
-            elif deferred:
-                # Resources are blocked. Let the others handle it.
+    task = Task.objects.create(
+        state=TASK_STATES.WAITING,
+        logging_cid=(get_guid()),
+        task_group=task_group,
+        name=function_name,
+        enc_args=args,
+        enc_kwargs=kwargs,
+        parent_task=Task.current(),
+        reserved_resources_record=resources,
+        versions=versions,
+        immediate=immediate,
+        deferred=deferred,
+        profile_options=x_task_diagnostics_var.get(None),
+        app_lock=None if not immediate else AppStatus.objects.current(),  # Lazy evaluation...
+    )
+    task.refresh_from_db()  # The database will have assigned a timestamp for us.
+    if immediate:
+        prior_tasks = Task.objects.filter(
+            state__in=TASK_INCOMPLETE_STATES, pulp_created__lt=task.pulp_created
+        )
+        # Compile a list of resources that must not be taken by other tasks.
+        colliding_resources = (
+            shared_resources
+            + exclusive_resources
+            + [f"shared:{resource}" for resource in exclusive_resources]
+        )
+        # Can we execute this task immediately?
+        if (
+            not colliding_resources
+            or not prior_tasks.filter(
+                reserved_resources_record__overlap=colliding_resources
+            ).exists()
+        ):
+            task.unblock()
+
+            cur_dir = os.getcwd()
+            with tempfile.TemporaryDirectory(dir=settings.WORKING_DIRECTORY) as working_dir:
+                os.chdir(working_dir)
+                try:
+                    execute_task(task)
+                finally:
+                    # Whether the task fails or not, we should always restore the workdir.
+                    os.chdir(cur_dir)
+
+            if resources:
                 notify_workers = True
-                task.app_lock = None
-                task.save()
-            else:
-                task.set_canceling()
-                task.set_canceled(TASK_STATES.CANCELED, "Resources temporarily unavailable.")
+        elif deferred:
+            # Resources are blocked. Let the others handle it.
+            task.app_lock = None
+            task.save()
+        else:
+            task.set_canceling()
+            task.set_canceled(TASK_STATES.CANCELED, "Resources temporarily unavailable.")
+    else:
+        notify_workers = True
     if notify_workers:
         wakeup_worker(TASK_WAKEUP_UNBLOCK)
     return task
@@ -304,7 +298,7 @@ def cancel_task(task_id):
     task = Task.objects.select_related("pulp_domain").get(pk=task_id)
 
     if task.state in TASK_FINAL_STATES:
-        # If the task is already done, just stop
+        # If the task is already done, just stop.
         _logger.debug(
             "Task [{task_id}] in domain: {name} already in a final state: {state}".format(
                 task_id=task_id, name=task.pulp_domain.name, state=task.state
@@ -315,12 +309,14 @@ def cancel_task(task_id):
         "Canceling task: {id} in domain: {name}".format(id=task_id, name=task.pulp_domain.name)
     )
 
-    # This is the only valid transition without holding the task lock
+    # This is the only valid transition without holding the task lock.
     task.set_canceling()
-    # Notify the worker that might be running that task and other workers to clean up
+    # Notify the worker that might be running that task.
     with connection.cursor() as cursor:
-        cursor.execute("SELECT pg_notify('pulp_worker_cancel', %s)", (str(task.pk),))
-        cursor.execute("NOTIFY pulp_worker_wakeup")
+        if task.app_lock is None:
+            wakeup_worker(TASK_WAKEUP_HANDLE)
+        else:
+            cursor.execute("SELECT pg_notify('pulp_worker_cancel', %s)", (str(task.pk),))
     return task