pulpcore 3.88.0__py3-none-any.whl → 3.89.0__py3-none-any.whl

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

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/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/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/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/app/settings.py

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

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/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
 
 

pulpcore/tasking/worker.py

@@ -15,7 +15,6 @@ from packaging.version import parse as parse_version
 from django.conf import settings
 from django.db import connection, DatabaseError, IntegrityError
 from django.db.models import Case, Count, F, Max, Value, When
-from django.db.models.functions import Random
 from django.utils import timezone
 
 from pulpcore.constants import (
@@ -54,6 +53,8 @@ TASK_GRACE_INTERVAL = settings.TASK_GRACE_INTERVAL
 TASK_KILL_INTERVAL = 1
 # Number of heartbeats between cleaning up worker processes (approx)
 WORKER_CLEANUP_INTERVAL = 100
+# Number of hearbeats between rechecking ignored tasks.
+IGNORED_TASKS_CLEANUP_INTERVAL = 100
 # Threshold time in seconds of an unblocked task before we consider a queue stalled
 THRESHOLD_UNBLOCKED_WAITING_TIME = 5
 
@@ -66,6 +67,9 @@ class PulpcoreWorker:
         self.wakeup_handle = False
         self.cancel_task = False
 
+        self.ignored_task_ids = []
+        self.ignored_task_countdown = IGNORED_TASKS_CLEANUP_INTERVAL
+
         self.auxiliary = auxiliary
         self.task = None
         self.name = f"{os.getpid()}@{socket.getfqdn()}"
@@ -73,13 +77,10 @@ class PulpcoreWorker:
         self.last_metric_heartbeat = timezone.now()
         self.versions = {app.label: app.version for app in pulp_plugin_configs()}
         self.cursor = connection.cursor()
-        try:
-            self.app_status = AppStatus.objects.create(
-                name=self.name, app_type="worker", versions=self.versions
-            )
-        except IntegrityError:
-            _logger.error(f"A worker with name {self.name} already exists in the database.")
-            exit(1)
+        self.app_status = AppStatus.objects.create(
+            name=self.name, app_type="worker", versions=self.versions
+        )
+
         # This defaults to immediate task cancellation.
         # It will be set into the future on moderately graceful worker shutdown,
         # and set to None for fully graceful shutdown.
@@ -152,6 +153,10 @@ class PulpcoreWorker:
             if notification.payload == str(self.task.pk):
                 self.cancel_task = True
 
+    def shutdown(self):
+        self.app_status.delete()
+        _logger.info(_("Worker %s was shut down."), self.name)
+
     def handle_worker_heartbeat(self):
         """
         Update worker heartbeat records.
@@ -174,9 +179,13 @@ class PulpcoreWorker:
             self.shutdown_requested = True
             self.cancel_task = True
 
-    def shutdown(self):
-        self.app_status.delete()
-        _logger.info(_("Worker %s was shut down."), self.name)
+    def cleanup_ignored_tasks(self):
+        for pk in (
+            Task.objects.filter(pk__in=self.ignored_task_ids)
+            .exclude(state__in=TASK_INCOMPLETE_STATES)
+            .values_list("pk", flat=True)
+        ):
+            self.ignored_task_ids.remove(pk)
 
     def worker_cleanup(self):
         qs = AppStatus.objects.older_than(age=timedelta(days=7))
@@ -198,6 +207,11 @@ class PulpcoreWorker:
     def beat(self):
         if self.app_status.last_heartbeat < timezone.now() - self.heartbeat_period:
             self.handle_worker_heartbeat()
+            if self.ignored_task_ids:
+                self.ignored_task_countdown -= 1
+                if self.ignored_task_countdown <= 0:
+                    self.ignored_task_countdown = IGNORED_TASKS_CLEANUP_INTERVAL
+                    self.cleanup_ignored_tasks()
             if not self.auxiliary:
                 self.worker_cleanup_countdown -= 1
                 if self.worker_cleanup_countdown <= 0:
@@ -217,15 +231,10 @@ class PulpcoreWorker:
 
         This function must only be called while holding the lock for that task. It is a no-op if
         the task is neither in "running" nor "canceling" state.
-
-        Return ``True`` if the task was actually canceled, ``False`` otherwise.
         """
         # A task is considered abandoned when in running state, but no worker holds its lock
         domain = task.pulp_domain
-        try:
-            task.set_canceling()
-        except RuntimeError:
-            return False
+        task.set_canceling()
         if reason:
             _logger.info(
                 "Cleaning up task %s in domain: %s and marking as %s. Reason: %s",
@@ -245,10 +254,8 @@ class PulpcoreWorker:
         task.set_canceled(final_state=final_state, reason=reason)
         if task.reserved_resources_record:
             self.notify_workers(TASK_WAKEUP_UNBLOCK)
-        return True
 
     def is_compatible(self, task):
-        domain = task.pulp_domain
         unmatched_versions = [
             f"task: {label}>={version} worker: {self.versions.get(label)}"
             for label, version in task.versions.items()
@@ -256,6 +263,7 @@ class PulpcoreWorker:
             or parse_version(self.versions[label]) < parse_version(version)
         ]
         if unmatched_versions:
+            domain = task.pulp_domain  # Hidden db roundtrip
             _logger.info(
                 _("Incompatible versions to execute task %s in domain: %s by worker %s: %s"),
                 task.pk,
@@ -361,70 +369,6 @@ class PulpcoreWorker:
 
         return count
 
-    def iter_tasks(self):
-        """Iterate over ready tasks and yield each task while holding the lock."""
-        while not self.shutdown_requested:
-            # When batching this query, be sure to use "pulp_created" as a cursor.
-            for task in Task.objects.filter(
-                state__in=TASK_INCOMPLETE_STATES,
-                unblocked_at__isnull=False,
-                app_lock__isnull=True,
-            ).order_by("-immediate", F("pulp_created") + Value(timedelta(seconds=8)) * Random()):
-                # This code will only be called if we acquired the lock successfully.
-                # The lock will be automatically be released at the end of the block.
-                with contextlib.suppress(AdvisoryLockError), task:
-                    # Check if someone else changed the task before we got the lock.
-                    task.refresh_from_db()
-                    if task.state not in TASK_INCOMPLETE_STATES:
-                        continue
-                    # We got the advisory lock (OLD) now try to get the app_lock (NEW).
-                    rows = Task.objects.filter(pk=task.pk, app_lock=None).update(
-                        app_lock=AppStatus.objects.current()
-                    )
-                    if rows == 0:
-                        _logger.error(
-                            "Acquired advisory lock but missed the app_lock for the task. "
-                            "This should only happen during the upgrade phase to the new app_lock."
-                            f"Task: {task.pk=}, {task.state=}, {task.app_lock=}."
-                        )
-                        continue
-                    try:
-                        if task.state == TASK_STATES.CANCELING:
-                            # No worker picked this task up before being canceled.
-                            if self.cancel_abandoned_task(task, TASK_STATES.CANCELED):
-                                # Continue looking for the next task without considering this
-                                # tasks resources, as we just released them.
-                                continue
-                        if task.state == TASK_STATES.RUNNING:
-                            # A running task without a lock must be abandoned.
-                            if self.cancel_abandoned_task(
-                                task, TASK_STATES.FAILED, "Worker has gone missing."
-                            ):
-                                # Continue looking for the next task without considering this
-                                # tasks resources, as we just released them.
-                                continue
-
-                        # This statement is using lazy evaluation.
-                        if (
-                            task.state == TASK_STATES.WAITING
-                            and task.unblocked_at is not None
-                            and self.is_compatible(task)
-                        ):
-                            yield task
-                            # Start from the top of the Task list.
-                            break
-                    finally:
-                        rows = Task.objects.filter(
-                            pk=task.pk, app_lock=AppStatus.objects.current()
-                        ).update(app_lock=None)
-                        if rows != 1:
-                            raise RuntimeError(
-                                "Something other than us is messing around with locks."
-                            )
-            else:
-                # No task found in the for-loop
-                break
-
     def sleep(self):
         """Wait for signals on the wakeup channel while heart beating."""
 
@@ -533,6 +477,44 @@ class PulpcoreWorker:
             self.notify_workers(TASK_WAKEUP_UNBLOCK)
         self.task = None
 
+    def fetch_task(self):
+        """
+        Fetch an available unblocked task and set the app_lock to this process.
+        """
+        # The PostgreSQL returning logic cannot be represented in Django ORM.
+        # Also I doubt that rewriting this in ORM makes it any more readable.
+        query = """
+            UPDATE core_task
+            SET app_lock_id = %s
+            WHERE pulp_id IN (
+                SELECT pulp_id FROM core_task
+                WHERE
+                    state = ANY(%s)
+                    AND unblocked_at IS NOT NULL
+                    AND app_lock_id IS NULL
+                    AND NOT pulp_id = ANY(%s)
+                ORDER BY immediate DESC, pulp_created + '8 s'::interval * random()
+                LIMIT 1
+                FOR UPDATE SKIP LOCKED
+            )
+            RETURNING
+                pulp_id,
+                state,
+                unblocked_at,
+                versions,
+                pulp_domain_id,
+                reserved_resources_record
+        """
+        qs = Task.objects.raw(
+            query,
+            [
+                self.app_status.pulp_id,
+                list(TASK_INCOMPLETE_STATES),
+                self.ignored_task_ids,
+            ],
+        )
+        return next(iter(qs), None)
+
     def handle_unblocked_tasks(self):
         """Pick and supervise tasks until there are no more available tasks.
 
@@ -540,14 +522,34 @@ class PulpcoreWorker:
         would go to sleep and wouldn't be able to know about the unhandled task until
         an external wakeup event occurs (e.g., new worker startup or new task gets in).
         """
-        keep_looping = True
-        while keep_looping and not self.shutdown_requested:
+        while not self.shutdown_requested:
             # Clear pending wakeups. We are about to handle them anyway.
             self.wakeup_handle = False
-            keep_looping = False
-            for task in self.iter_tasks():
-                keep_looping = True
-                self.supervise_task(task)
+
+            task = self.fetch_task()
+            if task is None:
+                # No task found
+                break
+            try:
+                if task.state == TASK_STATES.CANCELING:
+                    # No worker picked this task up before being canceled.
+                    # Or the worker disappeared before handling the canceling.
+                    self.cancel_abandoned_task(task, TASK_STATES.CANCELED)
+                elif task.state == TASK_STATES.RUNNING:
+                    # A running task without a lock must be abandoned.
+                    self.cancel_abandoned_task(task, TASK_STATES.FAILED, "Worker has gone missing.")
+                elif task.state == TASK_STATES.WAITING and self.is_compatible(task):
+                    self.supervise_task(task)
+                else:
+                    # Probably incompatible, but for whatever reason we didn't pick it up this time,
+                    # we don't need to look at it ever again.
+                    self.ignored_task_ids.append(task.pk)
+            finally:
+                rows = Task.objects.filter(pk=task.pk, app_lock=AppStatus.objects.current()).update(
+                    app_lock=None
+                )
+                if rows != 1:
+                    raise RuntimeError("Something other than us is messing around with locks.")
 
     def _record_unblocked_waiting_tasks_metric(self):
         now = timezone.now()

pulpcore/tests/functional/api/test_status.py

@@ -6,7 +6,7 @@ from jsonschema import validate
 
 
 STATUS = {
-    "$schema": "http://json-schema.org/schema#",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
     "title": "Pulp 3 status API schema",
     "description": ("Derived from Pulp's actual behaviour and various Pulp issues."),
     "type": "object",

pulpcore/tests/functional/api/test_upload.py

@@ -158,7 +158,9 @@ def test_upload_response(
         {"offset": 0, "size": 6291456},
         {"offset": 6291456, "size": 4194304},
     ]
-    sorted_chunks_response = sorted([c.dict() for c in upload.chunks], key=lambda i: i["offset"])
+    sorted_chunks_response = sorted(
+        [c.model_dump() for c in upload.chunks], key=lambda i: i["offset"]
+    )
     assert sorted_chunks_response == expected_chunks
 
 

pulpcore/tests/functional/api/using_plugin/test_distributions.py

@@ -85,7 +85,9 @@ def test_crud_publication_distribution(
     new_name = str(uuid4())
     distribution.name = new_name
     monitor_task(
-        file_bindings.DistributionsFileApi.update(distribution.pulp_href, distribution.dict()).task
+        file_bindings.DistributionsFileApi.update(
+            distribution.pulp_href, distribution.model_dump()
+        ).task
     )
     distribution = file_bindings.DistributionsFileApi.read(distribution.pulp_href)
     assert distribution.name == new_name
@@ -94,7 +96,9 @@ def test_crud_publication_distribution(
     new_base_path = str(uuid4())
     distribution.base_path = new_base_path
     monitor_task(
-        file_bindings.DistributionsFileApi.update(distribution.pulp_href, distribution.dict()).task
+        file_bindings.DistributionsFileApi.update(
+            distribution.pulp_href, distribution.model_dump()
+        ).task
     )
     distribution = file_bindings.DistributionsFileApi.read(distribution.pulp_href)
     assert distribution.base_path == new_base_path

pulpcore/tests/functional/utils.py

@@ -154,5 +154,5 @@ def get_from_url(url, auth=None, headers=None):
 
 async def _get_from_url(url, auth=None, headers=None):
     async with aiohttp.ClientSession(auth=auth) as session:
-        async with session.get(url, verify_ssl=False, headers=headers) as response:
+        async with session.get(url, ssl=False, headers=headers) as response:
             return response

pulpcore/tests/unit/metrics/test_aiohttp_instrumentation.py

@@ -10,7 +10,10 @@ def run_middleware(aiohttp_client):
     async def _run_middleware(provider):
         app = web.Application(middlewares=[instrumentation(provider=provider)])
 
-        app.router.add_get("/", lambda req: web.Response())
+        async def handler(req):
+            return web.Response()
+
+        app.router.add_get("/", handler)
 
         client = await aiohttp_client(app)
 

pulpcore/tests/unit/models/test_task.py

@@ -1,6 +1,6 @@
 import pytest
 import sys
-from pulpcore.app.models import Task, ProgressReport
+from pulpcore.app.models import AppStatus, Task, ProgressReport
 from pulpcore.constants import TASK_STATES
 
 
@@ -13,8 +13,10 @@ from pulpcore.constants import TASK_STATES
     ],
 )
 @pytest.mark.django_db
-def test_report_state_changes(to_state, use_canceled):
-    task = Task.objects.create(name="test", state=TASK_STATES.RUNNING)
+def test_report_state_changes(monkeypatch, to_state, use_canceled):
+    monkeypatch.setattr(AppStatus.objects, "_current_app_status", None)
+    app_status = AppStatus.objects.create(app_type="worker", name="test_runner")
+    task = Task.objects.create(name="test", state=TASK_STATES.RUNNING, app_lock=app_status)
     reports = {}
     for state in vars(TASK_STATES):
         report = ProgressReport(message="test", code="test", state=state, task=task)

pulpcore/tests/unit/stages/test_artifactdownloader.py

@@ -118,7 +118,7 @@ def queue_dc(in_q, downloader_mock):
 
 
 @pytest_asyncio.fixture
-async def download_task(event_loop, in_q, out_q):
+async def download_task(in_q, out_q):
     async def _download_task():
         """
         A coroutine running the downloader stage with a mocked ProgressReport.
@@ -133,7 +133,7 @@ async def download_task(event_loop, in_q, out_q):
             await ad()
         return pb.return_value.__aenter__.return_value.done
 
-    task = event_loop.create_task(_download_task())
+    task = asyncio.get_event_loop().create_task(_download_task())
     yield task
     if not task.done():
         task.cancel()

pulpcore/tests/unit/viewsets/test_viewset_base.py

@@ -1,5 +1,5 @@
 import pytest
-from pytest_django.asserts import assertQuerysetEqual
+from pytest_django.asserts import assertQuerySetEqual
 import unittest
 
 from django.http import Http404, QueryDict
@@ -23,7 +23,7 @@ def test_adds_filters():
     queryset = viewset.get_queryset()
     expected = models.RepositoryVersion.objects.filter(repository__pk=repo.pk)
 
-    assertQuerysetEqual(queryset, expected)
+    assertQuerySetEqual(queryset, expected)
 
 
 @pytest.mark.django_db
@@ -38,7 +38,7 @@ def test_does_not_add_filters():
     queryset = viewset.get_queryset()
     expected = models.Repository.objects.all()
 
-    assertQuerysetEqual(queryset, expected)
+    assertQuerySetEqual(queryset, expected)
 
 
 def test_must_define_serializer_class():

{pulpcore-3.88.0.dist-info → pulpcore-3.89.0.dist-info}/METADATA

@@ -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.dist-info → pulpcore-3.89.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_certguard/__init__.py,sha256=llnEd00PrsAretsgAOHiNKFbmvIdXe3iDVPmSaKz7gU,71
 pulp_certguard/pytest_plugin.py,sha256=qhRbChzqN2PROtD-65KuoTfKr5k9T3GPsz9daFgpqpM,852
-pulp_certguard/app/__init__.py,sha256=tG7rgUvhS8jhEQoUJz2nKo_Vep3DL0gKRw_KZqrjXvs,297
+pulp_certguard/app/__init__.py,sha256=v_a1q8VcjywdotIrzqCkXvyBTyZe-ktKVmAKWLZuysk,297
 pulp_certguard/app/models.py,sha256=YLEhBtZM4hetekVZ_GTnbLlWD6CkIQw2B3ILwXRcq-s,7483
 pulp_certguard/app/serializers.py,sha256=9IxlQiy783RdKF9oI1mrYS4haG5Boy2DOjfP_eJtMLY,1726
 pulp_certguard/app/viewsets.py,sha256=1_gNmsWyOT8kcOiGVkn4-wrtAjZO4wC8q0-aoEsCpjI,697
@@ -51,7 +51,7 @@ pulp_certguard/tests/unit/test_rhsm_check_path.py,sha256=Q1CsXnUgD7ELvtolPeumyNr
 pulp_file/__init__.py,sha256=0vOCXofR6Eyxkg4y66esnOGPeESCe23C1cNBHj56w44,61
 pulp_file/manifest.py,sha256=1WwIOJrPSkFcmkRm7CkWifVOCoZvo_nnANgce6uuG7U,3796
 pulp_file/pytest_plugin.py,sha256=l1PvTxUi5D3uJy4SnHWNhr-otWEYNcm-kc5nSqVJg0Y,10646
-pulp_file/app/__init__.py,sha256=eJq79DqK5SmoA1hu2g__h8xu-aMUZJ-zkyFFKeSihvs,292
+pulp_file/app/__init__.py,sha256=4YvCEsDnvVl-nX3X-bdvrlFLtBNQp-I1dTIhrtMMByY,292
 pulp_file/app/modelresource.py,sha256=v-m-_bBEsfr8wG0TI5ffx1TuKUy2-PsirhuQz4XXF-0,1063
 pulp_file/app/models.py,sha256=QsrVg_2uKqnR89sLN2Y7Zy260_nLIcUfa94uZowlmFw,4571
 pulp_file/app/replica.py,sha256=OtNWVmdFUgNTYhPttftVNQnSrnvx2_hnrJgtW_G0Vrg,1894
@@ -96,7 +96,7 @@ pulpcore/pytest_plugin.py,sha256=fy9vz5-bw30T7f4jxDtNIgF7L_0MJ_q7KIAzpvizvnY,382
 pulpcore/responses.py,sha256=mIGKmdCfTSoZxbFu4yIH1xbdLx1u5gqt3D99LTamcJg,6125
 pulpcore/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/app/access_policy.py,sha256=5vCKy6WoHtIt1_-eS5vMaZ7CmR4G-CIpsrB8yT-d88Q,6079
-pulpcore/app/apps.py,sha256=6s4GJXYwUryZSVR6pQfppofIoZ2qud5fIVlp-slv1-0,17412
+pulpcore/app/apps.py,sha256=zJJxHhtTfq3Q6HhPGyl4Sp_Y3hMGKiedm8Dkl6VTPos,17412
 pulpcore/app/authentication.py,sha256=1LIJW6HIQQlZrliHy__jdzkDEh6Oj7xKgd0V-vRcDus,2855
 pulpcore/app/checks.py,sha256=jbfTF7nmftBbky4AQXHigpyCaGydKasvRUXsd72JZVg,1946
 pulpcore/app/entrypoint.py,sha256=GYEq4GjglQZhFlU3865AT_H0nPypDKJAsf8qdyR4tPY,4985
@@ -115,7 +115,7 @@ pulpcore/app/redis_connection.py,sha256=VTdG0ulXuyESjYV6SJdG_jLzkLZH-MlLcD6pielw
 pulpcore/app/replica.py,sha256=rGE14OBaR_FKxmHL7NMxf_OizMyS-90IPsMRo_j9YRI,11474
 pulpcore/app/response.py,sha256=hYH_jSBrxmRsBr2bknmXE1qfs2g8JjDTXYcQ5ZWlF_c,1950
 pulpcore/app/role_util.py,sha256=84HSt8_9fxB--dtfSyg_TumVgOdyBbyP6rBaiAfTpOU,22393
-pulpcore/app/settings.py,sha256=k1MEoM25PXe1K8p9swB_lsNvg5Rd8X2mctuLTL7-nBw,21893
+pulpcore/app/settings.py,sha256=tjq6rQW5_uDgiIJVwMTTuJDfXR32QK0gl9UqPDYPhJQ,21876
 pulpcore/app/urls.py,sha256=0gdI74CAdycJStXSw1gknviDGe3J3k0UhS4J8RYa5dg,8120
 pulpcore/app/util.py,sha256=nYF6nZXgqVk4U1QeZEpWYX-wqitGSGAJip6W78IfXUk,24432
 pulpcore/app/wsgi.py,sha256=7rpZ_1NHEN_UfeNZCj8206bas1WeqRkHnGdxpd7rdDI,492
@@ -191,6 +191,7 @@ pulpcore/app/migrations/0139_task_app_lock.py,sha256=Dtu_om_zFplrPr8DageoiXOWUiO
 pulpcore/app/migrations/0140_require_appstatus_zdu.py,sha256=KrSyuQDg6Wd_M4RetDfGS9FDSMkHJxjh6BijR3Hro78,305
 pulpcore/app/migrations/0141_alter_appstatus_name.py,sha256=bkNO_1RrCFn5VQWTNRpz5LhZyWXluLdVekPfDGEHFB8,375
 pulpcore/app/migrations/0142_task_result.py,sha256=aoq81R1-mPylVQr7pQy5Bf2Yfz5ssjDqmSXUjv2rPHg,514
+pulpcore/app/migrations/0143_require_app_lock_zdu.py,sha256=RX6bk1VULScY9K5fyCejPBVbWojCVdRSB39WuLwgdIc,303
 pulpcore/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/app/models/__init__.py,sha256=P_2UnLmtQYbASWrm8elO2Zm_od-LXVqQKnjCwYFlZW0,3552
 pulpcore/app/models/access_policy.py,sha256=o4L41RGoZ5UMmh5UeeenmadD5MJgShguphgd4eAVxQA,6071
@@ -211,7 +212,7 @@ pulpcore/app/models/repository.py,sha256=SIc21Gex6okxI7OCfHEGIpXpGlypG3z9IgMt5-m
 pulpcore/app/models/role.py,sha256=dZklNd2VeAw4cT6dyJ7SyTBt9sZvdqakY86wXGAY3vU,3287
 pulpcore/app/models/status.py,sha256=WniovQQFdlR0TN-XWd_0FnBRiwzKxDyODyD-5VUgXjo,8290
 pulpcore/app/models/storage.py,sha256=2b-DQWaO31NqjV6FiISALegND-sQZAU7BVAsduUvm3o,6780
-pulpcore/app/models/task.py,sha256=hYjZrkZK0CURXt53GSsmkfnWs40hoN3xGQ_nicavrzc,16394
+pulpcore/app/models/task.py,sha256=0SLfpkyIvyJ1WAWKHl_eanjjincU0UUGyws1k0YTiys,16031
 pulpcore/app/models/upload.py,sha256=3njXT2rrVJwBjEDegvqcLD9_7cPnnl974lhbAhikEp8,3004
 pulpcore/app/models/vulnerability_report.py,sha256=DDAUjDaW3Kn9KPBkBl94u4EuQy8UIu5wKbmE5kMkhWE,1238
 pulpcore/app/protobuf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -286,7 +287,7 @@ pulpcore/cache/cache.py,sha256=d8GMlvjeGG9MOMdi5_9029WpGCKH8Y5q9b2lt3wSREo,17371
 pulpcore/content/__init__.py,sha256=mHYi85Hy-IhG50AR-jICk9pIiMUatHJx5wO1dFJkn9k,4000
 pulpcore/content/authentication.py,sha256=lEZBkXBBBkIdtFMCSpHDD7583M0bO-zsZNYXTmpr4k8,3235
 pulpcore/content/entrypoint.py,sha256=DiQTQzfcUiuyl37uvy6Wpa_7kr8t79ekpMHr31MDL2s,2132
-pulpcore/content/handler.py,sha256=0Qeppuy5Jl4C6L-UF5WQQm3oQJgeiA8asiOj42KIcik,56908
+pulpcore/content/handler.py,sha256=EubizF5HP5QK_N5eMe8sHIyUZT3ipVhaQJ-NYb1dr5g,56959
 pulpcore/content/instrumentation.py,sha256=H0N0GWzvOPGGjFi6eIbGW3mcvagfnAfazccTh-BZVmE,1426
 pulpcore/download/__init__.py,sha256=s3Wh2GKdsmbUooVIR6wSvhYVIhpaTbtfR3Ar1OJhC7s,154
 pulpcore/download/base.py,sha256=4KCAYnV8jSOX078ETwlfwNZGY3xCBF9yy866tyGKAzE,13095
@@ -339,12 +340,12 @@ pulpcore/tasking/_util.py,sha256=fPW4k1nUa_NZ0ywy_A15Fuiejo5stY58abPbZTXw5t8,990
 pulpcore/tasking/entrypoint.py,sha256=eAypZD4ORoNOrmBeMdbwO9p6GSQ59bMvZ3TrbnE0czw,1305
 pulpcore/tasking/kafka.py,sha256=76z4DzeXM1WL5uu1HlKnduWeLO3-b-czvGBXdWR6054,3845
 pulpcore/tasking/storage.py,sha256=zQkwlpC_FDQtmZGZ8vKwHqxvD6CLO_gAS4Q7wijZE-k,3106
-pulpcore/tasking/tasks.py,sha256=R7ZiBg47glMZxSiXWGXFJm6eec4oIJB1EZEIZsWrdfE,12968
-pulpcore/tasking/worker.py,sha256=r8Q6hVqmGrnyXFX-RnxMkZUq478lIDLnZxwyd5DeScw,27400
+pulpcore/tasking/tasks.py,sha256=MyqqjkFbl3GSkfLu1MKEe7bJiGRn924_uAa4l18QSSk,12459
+pulpcore/tasking/worker.py,sha256=vuQDKmxWxkeWCqNrye5MUlx2qSFn3W8sMJumEu_kSPE,26596
 pulpcore/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/functional/content_with_coverage.py,sha256=gQK8himy32s9O9vpXdgoM6-_z2KySaXm5rTga9z0jGI,260
-pulpcore/tests/functional/utils.py,sha256=ozSiMSErg4vkHFWSfQH5bbMcrtSwGK9u-a2TVqNe50I,4699
+pulpcore/tests/functional/utils.py,sha256=FgqQwcciV8gFEfYB-RFO4bwAYp8FHDRAwRJGIl4TL-E,4692
 pulpcore/tests/functional/api/__init__.py,sha256=ougP6XAtutbcm8kwvJN5i51KEeQZT2-A7u-Y3so2mi4,57
 pulpcore/tests/functional/api/test_access_policy.py,sha256=R2vPadltPVpOL61LiarfOOl7W7m3EB8LXlmwRQJcVxg,3984
 pulpcore/tests/functional/api/test_api_docs.py,sha256=72CB6jRB1Inubj0ZdkV9FsFBbu4YQDqn1ITNvemnAxg,1133
@@ -364,10 +365,10 @@ pulpcore/tests/functional/api/test_role.py,sha256=JnhVMs22IP3ngdwu4P0vVgJuGGkqjK
 pulpcore/tests/functional/api/test_root_endpoint.py,sha256=CSp68Z6APY9pCvu-JtX820TnF9t2MllAxRGT3ekw5Fs,244
 pulpcore/tests/functional/api/test_scoping.py,sha256=uiLOsx5_7puRMcvrpPKEYQziqluPNv9vstySfoD7Edc,2671
 pulpcore/tests/functional/api/test_signing_service.py,sha256=yr1HXBrNoliBHJNAGAN4PAN0eBKPIvAQP-uMoMSrO_I,222
-pulpcore/tests/functional/api/test_status.py,sha256=Vmmj-ueGxJw1JFSQtr5feTM8vjgyyROvxsRm-OgzLUQ,5370
+pulpcore/tests/functional/api/test_status.py,sha256=S4lWuemCLwM4rC3fCCZEehGMGypirPo5fnT7bkJuYxI,5384
 pulpcore/tests/functional/api/test_task_purge.py,sha256=Av4DrUdCqf-JegfoP1pkY4B-teoUzYd1LBZKAhDa-08,7273
 pulpcore/tests/functional/api/test_tasking.py,sha256=4QPkdPVt1L01GzXyCWDmKwQbCPATSj-UznjDUFt609U,21204
-pulpcore/tests/functional/api/test_upload.py,sha256=oLP1ZmQgPzgK5jAQwGeXS8uLFHgAzVeLW0GfANMWexI,6794
+pulpcore/tests/functional/api/test_upload.py,sha256=dG9G6jLl-qGqC87LWJfkDJ1s3ppDdeanTmbbIVQnYQQ,6814
 pulpcore/tests/functional/api/test_users_groups.py,sha256=YFG0xtyJuIRraczR7ERl_UNS7dlJfKd2eUmXgD1lLBU,2926
 pulpcore/tests/functional/api/test_workers.py,sha256=XJrQdxt0BpMeMVOdTyzcTEMk5bB8XC4rA8U580HnzBc,4691
 pulpcore/tests/functional/api/using_plugin/__init__.py,sha256=QyyfzgjLOi4n32G3o9aGH5eQDNjjD_qUpHLOZpPPZa4,80
@@ -380,7 +381,7 @@ pulpcore/tests/functional/api/using_plugin/test_content_path.py,sha256=fvqeptqo-
 pulpcore/tests/functional/api/using_plugin/test_content_promotion.py,sha256=Co4ytrfpzklwgDdEthv45dsmrceRpqIQfLJlZWM6EBY,2388
 pulpcore/tests/functional/api/using_plugin/test_contentguard.py,sha256=aMZf4g1uNHhWM7cAJa7bC49A-9uNLIphlr6sBkCOzi8,12894
 pulpcore/tests/functional/api/using_plugin/test_crud_repos.py,sha256=4XJ7e_BnzOIBpdTFt2kpiZC_YEu2bBimFpxURKvQwfU,14334
-pulpcore/tests/functional/api/using_plugin/test_distributions.py,sha256=Xv0q8KZRdyeAevJhWwTs3_2bkG4hxZeZtA_4CXcssEo,11936
+pulpcore/tests/functional/api/using_plugin/test_distributions.py,sha256=CeOMN4iTzATp_NJC0Bu2n8RFyQKiIk3y8hcfERQJcfk,11992
 pulpcore/tests/functional/api/using_plugin/test_filesystemexport.py,sha256=s5C9lW5Q4gaY56d3Rsa-uadcn_3D7rWQ2CosowTe8_Y,6059
 pulpcore/tests/functional/api/using_plugin/test_labels.py,sha256=LO45iAFel4SKB6R5InUouiifGu_eHMZnoMFmwI4cSyE,2463
 pulpcore/tests/functional/api/using_plugin/test_migrate.py,sha256=DiCAessLO4B9jnTNkngczIdsHswNr73H4is_6H1Ue2I,4457
@@ -417,7 +418,7 @@ pulpcore/tests/unit/download/test_downloader_base.py,sha256=TYG_OPuyj-_N5L-zLTW1
 pulpcore/tests/unit/download/test_downloader_factory.py,sha256=mumtIAtRg_dS2uQvOH3J5NXb9XuvQ53iWlBP5koZ_nM,1177
 pulpcore/tests/unit/metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/unit/metrics/conftest.py,sha256=pyA8wwLO-TsyERvYnwnF2_Ura0rvZbAmjSUzivcMrE4,620
-pulpcore/tests/unit/metrics/test_aiohttp_instrumentation.py,sha256=yPTiVv_9oOqL1Y6I66tX0XQomxu0Efw-Q0-LxzvQBT4,568
+pulpcore/tests/unit/metrics/test_aiohttp_instrumentation.py,sha256=qQrO2LEutBrY182EHcsQVDsUSkpQrpV11rduR2XXR4w,616
 pulpcore/tests/unit/metrics/test_django_instrumentation.py,sha256=vkUGm_Q0WCph6x-fWOX8bkpY7XFaNjqVKnJ2zWqu08Q,676
 pulpcore/tests/unit/migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/unit/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -425,7 +426,7 @@ pulpcore/tests/unit/models/test_base.py,sha256=77hnxOFBJYMNbI1YGEaR5yj8VCapNGmEg
 pulpcore/tests/unit/models/test_content.py,sha256=heU0vJKucPIp6py2Ww-eXLvhFopvmK8QjFgzt1jGnYQ,5599
 pulpcore/tests/unit/models/test_remote.py,sha256=KxXwHdA-wj7D-ZpuVi33cLX43wkEeIzeqF9uMsJGt-k,2354
 pulpcore/tests/unit/models/test_repository.py,sha256=ciwyo7dMl-dxlzHb55eQ-ohEEBPF3-GjbO23mMSccqQ,13791
-pulpcore/tests/unit/models/test_task.py,sha256=rjxeYe383Zsjk8Ck4inMBBTzR4osCrgTeZNWwmHfbjk,1457
+pulpcore/tests/unit/models/test_task.py,sha256=zkHNs2DYpJbl-nMNFXs21Pyvw9eSpmSIJFFFXK2dT90,1655
 pulpcore/tests/unit/roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/unit/roles/test_roles.py,sha256=TkPPCLEHMaxfafsRf_3pc4Z3w8BPTyteY7rFkVo65GM,4973
 pulpcore/tests/unit/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -437,13 +438,13 @@ pulpcore/tests/unit/serializers/test_pulpexport.py,sha256=gXn7E13X-SP0rFM0bUv8Pw
 pulpcore/tests/unit/serializers/test_repository.py,sha256=eknsHlbHz1K0nqntDntltFLU2EunrSlXCgg3HrV9PTI,9288
 pulpcore/tests/unit/serializers/test_user.py,sha256=lemDxBIDWKrfFmazl9DMW7-k3lQyWtD8uQCxNktHI3Q,3094
 pulpcore/tests/unit/stages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulpcore/tests/unit/stages/test_artifactdownloader.py,sha256=qB1ANdFmNtUnljg8fCdLHTiAakrO3KtX-w9RA5fPSOQ,12480
+pulpcore/tests/unit/stages/test_artifactdownloader.py,sha256=DX6jHctGYbDhsnzQpXfEnAbcr-Q6_QWs6ETIZDJmSK4,12482
 pulpcore/tests/unit/stages/test_stages.py,sha256=H1a2BQLjdZlZvcb_qULp62huZ1xy6ItTcthktVyGU0w,4735
 pulpcore/tests/unit/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulpcore/tests/unit/viewsets/test_viewset_base.py,sha256=W9o3V6758bZctR6krMPPQytb0xJuF-jb4uBWTNDoD_U,4837
-pulpcore-3.88.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
-pulpcore-3.88.0.dist-info/METADATA,sha256=j7bAhZIZWFrsl9Qpdw5_lQbIVwKYFssAvhjN3mpCZxU,4104
-pulpcore-3.88.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pulpcore-3.88.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
-pulpcore-3.88.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
-pulpcore-3.88.0.dist-info/RECORD,,
+pulpcore/tests/unit/viewsets/test_viewset_base.py,sha256=gmVIgE9o0tAdiF92HCNiJkb1joc8oEaG5rnzh5V1loc,4837
+pulpcore-3.89.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.89.0.dist-info/METADATA,sha256=mS1LG2PZjuNRjuezug7aAhP2g2g32swvlibYJmpLYLE,4104
+pulpcore-3.89.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pulpcore-3.89.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.89.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.89.0.dist-info/RECORD,,