pulpcore 3.86.0__tar.gz → 3.87.1__tar.gz

{pulpcore-3.86.0 → pulpcore-3.87.1}/CHANGES.md

@@ -8,6 +8,52 @@
 
 [//]: # (towncrier release notes start)
 
+## 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 }
+
+#### Bugfixes {: #3.87.0-rest-api-bugfix }
+
+- Fixed apps crashing in a loop on restart with the same name.
+  [#6880](https://github.com/pulp/pulpcore/issues/6880)
+
+### Plugin API {: #3.87.0-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.87.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.87.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.86.0 (2025-08-21) {: #3.86.0 }
 
 ### REST API {: #3.86.0-rest-api }

{pulpcore-3.86.0 → pulpcore-3.87.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.86.0
+Version: 3.87.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -50,7 +50,7 @@ Requires-Dist: pulp-glue<0.36,>=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
-Requires-Dist: python-gnupg<=0.5.4,>=0.5
+Requires-Dist: python-gnupg<0.6,>=0.5.0
 Requires-Dist: PyYAML<6.1,>=5.1.1
 Requires-Dist: redis<6.5,>=4.3.0
 Requires-Dist: tablib<3.6,>=3.5.0

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulp_certguard/app/__init__.py

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

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulp_file/app/__init__.py

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

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/apps.py

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

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/management/commands/remove-plugin.py

@@ -11,7 +11,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.management import BaseCommand, call_command, CommandError
 
 from pulpcore.app.apps import pulp_plugin_configs
-from pulpcore.app.models import AccessPolicy, ContentAppStatus, Worker
+from pulpcore.app.models import AccessPolicy, AppStatus
 from pulpcore.app.models.role import Role
 from pulpcore.app.util import get_view_urlpattern
 
@@ -53,10 +53,7 @@ class Command(BaseCommand):
             "Checking if Pulp services are running, it can take up to {}s...".format(waiting_time)
         )
         while is_pulp_running and (time.time() - check_started) < waiting_time:
-            is_pulp_running = (
-                ContentAppStatus.objects.online().exists()
-                or Worker.objects.online_workers().exists()
-            )
+            is_pulp_running = AppStatus.objects.online().exists()
             time.sleep(2)
 
         if is_pulp_running:

pulpcore-3.87.1/pulpcore/app/migrations/0140_require_appstatus_zdu.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.2.23 on 2025-08-12 15:20
+
+from django.db import migrations
+from pulpcore.migrations import RequireVersion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0139_task_app_lock'),
+    ]
+
+    operations = [
+        RequireVersion("core", "3.85"),
+    ]

pulpcore-3.87.1/pulpcore/app/migrations/0141_alter_appstatus_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-08-27 10:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0140_require_appstatus_zdu'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appstatus',
+            name='name',
+            field=models.TextField(),
+        ),
+    ]

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/models/status.py

@@ -61,16 +61,7 @@ class _AppStatusManager(AppStatusManager):
         if self._current_app_status is not None:
             raise RuntimeError("There is already an app status in this process.")
 
-        if app_type == "api":
-            old_obj = ApiAppStatus.objects.create(**kwargs)
-        elif app_type == "worker":
-            from pulpcore.app.models import Worker
-
-            old_obj = Worker.objects.create(**kwargs)
-        else:
-            raise NotImplementedError(f"Invalid app_type: {app_type}")
         obj = super().create(app_type=app_type, **kwargs)
-        obj._old_status = old_obj
         self._current_app_status = obj
         return obj
 
@@ -78,12 +69,7 @@ class _AppStatusManager(AppStatusManager):
         if self._current_app_status is not None:
             raise RuntimeError("There is already an app status in this process.")
 
-        if app_type == "content":
-            old_obj = await ContentAppStatus.objects.acreate(**kwargs)
-        else:
-            raise NotImplementedError(f"Invalid app_type: {app_type}")
         obj = await super().acreate(app_type=app_type, **kwargs)
-        obj._old_status = old_obj
         self._current_app_status = obj
         return obj
 
@@ -125,7 +111,7 @@ class AppStatus(BaseModel):
     objects = _AppStatusManager()
 
     app_type = models.CharField(max_length=10, choices=APP_TYPES)
-    name = models.TextField(db_index=True, unique=True)
+    name = models.TextField()
     versions = HStoreField(default=dict)
     ttl = models.DurationField(null=False)
     last_heartbeat = models.DateTimeField(auto_now=True)
@@ -133,13 +119,6 @@ class AppStatus(BaseModel):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ttl = timedelta(seconds=self._APP_TTL[self.app_type])
-        self._old_status = None
-
-    def delete(self, *args, **kwargs):
-        # adelete will call into this, so we should not replicate that one here.
-        if self._old_status is not None:
-            self._old_status.delete(*args, **kwargs)
-        super().delete(*args, **kwargs)
 
     @property
     def online(self) -> bool:
@@ -171,7 +150,6 @@ class AppStatus(BaseModel):
             ValueError: When the model instance has never been saved before. This method can
                 only update an existing database record.
         """
-        self._old_status.save_heartbeat()
         self.save(update_fields=["last_heartbeat"])
 
     async def asave_heartbeat(self):
@@ -184,7 +162,6 @@ class AppStatus(BaseModel):
             ValueError: When the model instance has never been saved before. This method can
                 only update an existing database record.
         """
-        await self._old_status.asave_heartbeat()
         await self.asave(update_fields=["last_heartbeat"])
 
     @property

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/serializers/status.py

@@ -2,11 +2,21 @@ from gettext import gettext as _
 
 from rest_framework import serializers
 
-from pulpcore.app.serializers.task import (
-    ApiAppStatusSerializer,
-    ContentAppStatusSerializer,
-    WorkerSerializer,
-)
+from pulpcore.app.models import AppStatus
+
+
+class AppStatusSerializer(serializers.ModelSerializer):
+    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
+    last_heartbeat = serializers.DateTimeField(
+        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
+    )
+    versions = serializers.HStoreField(
+        help_text=_("Versions of the components installed."), read_only=True
+    )
+
+    class Meta:
+        model = AppStatus
+        fields = ("name", "last_heartbeat", "versions")
 
 
 class VersionSerializer(serializers.Serializer):
@@ -88,7 +98,7 @@ class StatusSerializer(serializers.Serializer):
 
     versions = VersionSerializer(help_text=_("Version information of Pulp components"), many=True)
 
-    online_workers = WorkerSerializer(
+    online_workers = AppStatusSerializer(
         help_text=_(
             "List of online workers known to the application. An online worker is actively "
             "heartbeating and can respond to new work."
@@ -96,7 +106,7 @@ class StatusSerializer(serializers.Serializer):
         many=True,
     )
 
-    online_api_apps = ApiAppStatusSerializer(
+    online_api_apps = AppStatusSerializer(
         help_text=_(
             "List of online api apps known to the application. An online api app "
             "is actively heartbeating and can serve the rest api to clients."
@@ -104,7 +114,7 @@ class StatusSerializer(serializers.Serializer):
         many=True,
     )
 
-    online_content_apps = ContentAppStatusSerializer(
+    online_content_apps = AppStatusSerializer(
         help_text=_(
             "List of online content apps known to the application. An online content app "
             "is actively heartbeating and can serve data to clients."

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/serializers/task.py

@@ -198,34 +198,6 @@ class TaskCancelSerializer(serializers.Serializer):
         fields = ("state",)
 
 
-class ApiAppStatusSerializer(ModelSerializer):
-    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
-    last_heartbeat = serializers.DateTimeField(
-        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
-    )
-    versions = serializers.HStoreField(
-        help_text=_("Versions of the components installed."), read_only=True
-    )
-
-    class Meta:
-        model = models.ApiAppStatus
-        fields = ("name", "last_heartbeat", "versions")
-
-
-class ContentAppStatusSerializer(ModelSerializer):
-    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
-    last_heartbeat = serializers.DateTimeField(
-        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
-    )
-    versions = serializers.HStoreField(
-        help_text=_("Versions of the components installed."), read_only=True
-    )
-
-    class Meta:
-        model = models.ContentAppStatus
-        fields = ("name", "last_heartbeat", "versions")
-
-
 class WorkerSerializer(ModelSerializer):
     pulp_href = IdentityField(view_name="workers-detail")
 
@@ -246,7 +218,7 @@ class WorkerSerializer(ModelSerializer):
     )
 
     class Meta:
-        model = models.Worker
+        model = models.AppStatus
         fields = ModelSerializer.Meta.fields + (
             "name",
             "last_heartbeat",

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/tasks/analytics.py

@@ -19,8 +19,7 @@ from google.protobuf.json_format import MessageToJson
 from pulpcore.app.apps import pulp_plugin_configs
 from pulpcore.app.models import SystemID, Group, Domain, AccessPolicy
 from pulpcore.app.models.role import Role
-from pulpcore.app.models.status import ContentAppStatus
-from pulpcore.app.models.task import Worker
+from pulpcore.app.models.status import AppStatus
 from pulpcore.app.protobuf.analytics_pb2 import Analytics
 
 
@@ -79,13 +78,13 @@ async def _versions_data(analytics):
 
 
 async def _online_content_apps_data(analytics):
-    online_content_apps_qs = ContentAppStatus.objects.online()
+    online_content_apps_qs = AppStatus.objects.online().filter(app_type="content")
     analytics.online_content_apps.processes = await online_content_apps_qs.acount()
     analytics.online_content_apps.hosts = await _num_hosts(online_content_apps_qs)
 
 
 async def _online_workers_data(analytics):
-    online_workers_qs = Worker.objects.online()
+    online_workers_qs = AppStatus.objects.online().filter(app_type="worker")
     analytics.online_workers.processes = await online_workers_qs.acount()
     analytics.online_workers.hosts = await _num_hosts(online_workers_qs)
 

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/tasks/importer.py

@@ -18,6 +18,7 @@ from tablib import Dataset
 from pulpcore.exceptions.plugin import MissingPlugin
 from pulpcore.app.apps import get_plugin_config
 from pulpcore.app.models import (
+    AppStatus,
     Artifact,
     Content,
     CreatedResource,
@@ -28,7 +29,6 @@ from pulpcore.app.models import (
     Repository,
     Task,
     TaskGroup,
-    Worker,
 )
 from pulpcore.app.modelresource import (
     ArtifactResource,
@@ -508,7 +508,7 @@ def pulp_import(importer_pk, path, toc, create_repositories):
         # By default (setting is not-set), import will continue to use 100% of the available
         # workers.
         import_workers_percent = int(settings.get("IMPORT_WORKERS_PERCENT", 100))
-        total_workers = Worker.objects.online().count()
+        total_workers = AppStatus.objects.online().filter(app_type="worker").count()
         import_workers = max(1, int(total_workers * (import_workers_percent / 100.0)))
 
         with open(os.path.join(temp_dir, REPO_FILE), "r") as repo_data_file:

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/views/status.py

@@ -11,8 +11,7 @@ from collections import namedtuple
 
 from pulpcore.app.apps import pulp_plugin_configs
 from pulpcore.app.models.content import Artifact
-from pulpcore.app.models.status import ApiAppStatus, ContentAppStatus
-from pulpcore.app.models.task import Worker
+from pulpcore.app.models.status import AppStatus
 from pulpcore.app.serializers.status import StatusSerializer
 from pulpcore.app.redis_connection import get_redis_connection
 from pulpcore.app.util import get_domain
@@ -79,9 +78,9 @@ class StatusView(APIView):
 
         db_status = {"connected": self._get_db_conn_status()}
 
-        online_workers = Worker.objects.online()
-        online_api_apps = ApiAppStatus.objects.online()
-        online_content_apps = ContentAppStatus.objects.online()
+        online_workers = AppStatus.objects.online().filter(app_type="worker")
+        online_api_apps = AppStatus.objects.online().filter(app_type="api")
+        online_content_apps = AppStatus.objects.online().filter(app_type="content")
 
         content_settings = {
             "content_origin": settings.CONTENT_ORIGIN,
@@ -113,7 +112,7 @@ class StatusView(APIView):
             bool: True if there's a db connection. False otherwise.
         """
         try:
-            Worker.objects.count()
+            AppStatus.objects.count()
         except Exception:
             _logger.exception(_("Cannot connect to database during status check."))
             return False

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/app/viewsets/task.py

@@ -12,11 +12,11 @@ from rest_framework.serializers import DictField, URLField, ValidationError
 
 from pulpcore.filters import BaseFilterSet
 from pulpcore.app.models import (
+    AppStatus,
     ProfileArtifact,
     Task,
     TaskGroup,
     TaskSchedule,
-    Worker,
     CreatedResource,
     RepositoryVersion,
 )
@@ -48,6 +48,7 @@ from pulpcore.app.role_util import get_objects_for_user
 
 class TaskFilter(BaseFilterSet):
     created_resources = CreatedResourcesFilter()
+    worker = filters.CharFilter(method="worker_filter")
     # Non model field filters
     reserved_resources = ReservedResourcesFilter(exclusive=True, shared=True)
     reserved_resources__in = ReservedResourcesInFilter(exclusive=True, shared=True)
@@ -56,6 +57,13 @@ class TaskFilter(BaseFilterSet):
     shared_resources = ReservedResourcesFilter(exclusive=False, shared=True)
     shared_resources__in = ReservedResourcesInFilter(exclusive=False, shared=True)
 
+    def worker_filter(self, queryset, name, value):
+        # The worker field on tasks is no longer used.
+        if value is None:
+            return queryset
+        else:
+            return queryset.none()
+
     class Meta:
         model = Task
         fields = {
@@ -354,14 +362,14 @@ class WorkerFilter(BaseFilterSet):
     missing = filters.BooleanFilter(method="filter_missing")
 
     class Meta:
-        model = Worker
+        model = AppStatus
         fields = {
             "name": NAME_FILTER_OPTIONS,
             "last_heartbeat": DATETIME_FILTER_OPTIONS,
         }
 
     def filter_online(self, queryset, name, value):
-        online_workers = Worker.objects.online()
+        online_workers = AppStatus.objects.online()
 
         if value:
             return queryset.filter(pk__in=online_workers)
@@ -369,7 +377,7 @@ class WorkerFilter(BaseFilterSet):
             return queryset.exclude(pk__in=online_workers)
 
     def filter_missing(self, queryset, name, value):
-        missing_workers = Worker.objects.missing()
+        missing_workers = AppStatus.objects.missing()
 
         if value:
             return queryset.filter(pk__in=missing_workers)
@@ -378,7 +386,8 @@ class WorkerFilter(BaseFilterSet):
 
 
 class WorkerViewSet(NamedModelViewSet, mixins.RetrieveModelMixin, mixins.ListModelMixin):
-    queryset = Worker.objects.all()
+    queryset = AppStatus.objects.filter(app_type="worker")
+    pulp_model_alias = "Worker"
     serializer_class = WorkerSerializer
     endpoint_name = "workers"
     http_method_names = ["get", "options"]

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/openapi/__init__.py

@@ -260,7 +260,7 @@ class PulpSchemaGenerator(SchemaGenerator):
             prefix (str): Optional prefix to add to the slug
             pulp_model_alias (str): Optional model name to use instead of model.__name__
         Returns:
-            str: *pulp_href where * is the model name in all lower case letters
+            str: '{model_name_snake_case}_href'
         """
         app_label = model._meta.app_label
         model_name = pulp_model_alias or model.__name__

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/tasking/worker.py

@@ -77,7 +77,6 @@ class PulpcoreWorker:
             self.app_status = AppStatus.objects.create(
                 name=self.name, app_type="worker", versions=self.versions
             )
-            self.worker = self.app_status._old_status
         except IntegrityError:
             _logger.error(f"A worker with name {self.name} already exists in the database.")
             exit(1)
@@ -184,15 +183,17 @@ class PulpcoreWorker:
         for app_worker in qs:
             _logger.info(_("Clean missing %s worker %s."), app_worker.app_type, app_worker.name)
         qs.delete()
-        for cls, cls_name in (
-            (Worker, "pulp"),
-            (ApiAppStatus, "api"),
-            (ContentAppStatus, "content"),
-        ):
-            qs = cls.objects.missing(age=timedelta(days=7))
-            for app_worker in qs:
-                _logger.info(_("Clean missing %s worker %s."), cls_name, app_worker.name)
-            qs.delete()
+        with contextlib.suppress(DatabaseError):
+            # By now a migration on a newer release may have deleted these tables already.
+            for cls, cls_name in (
+                (Worker, "pulp"),
+                (ApiAppStatus, "api"),
+                (ContentAppStatus, "content"),
+            ):
+                qs = cls.objects.missing(age=timedelta(days=7))
+                for app_worker in qs:
+                    _logger.info(_("Clean missing %s worker %s."), cls_name, app_worker.name)
+                qs.delete()
 
     def beat(self):
         if self.app_status.last_heartbeat < timezone.now() - self.heartbeat_period:
@@ -367,10 +368,15 @@ class PulpcoreWorker:
             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()
@@ -379,19 +385,17 @@ class PulpcoreWorker:
                         _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:
-                        # Check if someone else changed the task before we got the lock.
-                        task.refresh_from_db()
-
-                        if task.state == TASK_STATES.CANCELING and task.worker is None:
+                        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 in [TASK_STATES.RUNNING, TASK_STATES.CANCELING]:
+                        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."
@@ -445,8 +449,6 @@ class PulpcoreWorker:
 
         self.cancel_task = False
         self.task = task
-        task.worker = self.worker
-        task.save(update_fields=["worker"])
         cancel_state = None
         cancel_reason = None
         domain = task.pulp_domain

{pulpcore-3.86.0 → pulpcore-3.87.1}/pulpcore/tests/functional/api/test_tasking.py

@@ -230,25 +230,6 @@ def test_retrieve_task_with_minimal_fields(task, bindings_cfg):
     assert unexpected_fields.isdisjoint(returned_fields)
 
 
-@pytest.mark.parallel
-def test_retrieve_task_using_invalid_worker(pulpcore_bindings):
-    """Expects to raise an exception when using invalid worker value as filter."""
-
-    with pytest.raises(ApiException) as ctx:
-        pulpcore_bindings.TasksApi.list(worker=str(uuid4()))
-
-    assert ctx.value.status == 400
-
-
-@pytest.mark.parallel
-def test_retrieve_task_using_valid_worker(task, pulpcore_bindings):
-    """Expects to retrieve a task using a valid worker URI as filter."""
-
-    response = pulpcore_bindings.TasksApi.list(worker=task.worker)
-
-    assert response.results and response.count
-
-
 @pytest.mark.parallel
 def test_retrieve_task_using_valid_date(task, pulpcore_bindings):
     """Expects to retrieve a task using a valid date."""
@@ -278,22 +259,6 @@ def test_search_task_using_an_invalid_name(pulpcore_bindings):
     assert not search_results.results and not search_results.count
 
 
-@pytest.mark.parallel
-def test_filter_tasks_using_worker__in_filter(pulpcore_bindings, dispatch_task, monitor_task):
-    task1_href = dispatch_task("pulpcore.app.tasks.test.sleep", args=(0,))
-    task2_href = dispatch_task("pulpcore.app.tasks.test.sleep", args=(0,))
-
-    task1 = monitor_task(task1_href)
-    task2 = monitor_task(task2_href)
-
-    search_results = pulpcore_bindings.TasksApi.list(worker__in=(task1.worker, task2.worker))
-
-    tasks_hrefs = [task.pulp_href for task in search_results.results]
-
-    assert task1_href in tasks_hrefs
-    assert task2_href in tasks_hrefs
-
-
 @pytest.mark.parallel
 def test_filter_tasks_using_pulp_created_filter(pulpcore_bindings, dispatch_task):
 
@@ -487,7 +452,6 @@ class TestImmediateTaskWithNoResource:
         )
         task = pulpcore_bindings.TasksApi.read(task_href)
         assert task.state == "completed"
-        assert task.worker is None
 
     @pytest.mark.parallel
     def test_executes_on_api_worker_when_no_async(
@@ -519,7 +483,7 @@ class TestImmediateTaskWithNoResource:
             "pulpcore.app.tasks.test.asleep", args=(GT_TIMEOUT,), immediate=True
         )
         task = pulpcore_bindings.TasksApi.read(task_href)
-        assert task.worker is None
+        assert task.state == "failed"
         assert "task timed out after" in task.error["description"]
 
 
@@ -555,7 +519,7 @@ class TestImmediateTaskWithBlockedResource:
         """
         GIVEN an async task requiring busy resources
         WHEN dispatching a task as immediate
-        THEN the task completes with a worker
+        THEN the task returns as waiting first
         """
         COMMON_RESOURCE = str(uuid4())
         with resource_blocker(exclusive_resources=[COMMON_RESOURCE]):
@@ -565,9 +529,10 @@ class TestImmediateTaskWithBlockedResource:
                 immediate=True,
                 exclusive_resources=[COMMON_RESOURCE],
             )
+            task = pulpcore_bindings.TasksApi.read(task_href)
+            assert task.state == "waiting"
         task = monitor_task(task_href)
         assert task.state == "completed"
-        assert task.worker is not None
 
     @pytest.mark.parallel
     def test_throws_when_non_deferrable(
@@ -589,7 +554,6 @@ class TestImmediateTaskWithBlockedResource:
             )
             task = pulpcore_bindings.TasksApi.read(task_href)
             assert task.state == "canceled"
-            assert task.worker is None
             assert "Resources temporarily unavailable." in task.error["reason"]
 
     @pytest.mark.parallel