pulpcore 3.87.0__tar.gz → 3.87.1__tar.gz

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

@@ -8,6 +8,29 @@
 
 [//]: # (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 }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.87.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

{pulpcore-3.87.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.87.0"
+    version = "3.87.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.87.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.87.0"
+    version = "3.87.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.87.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.87.0"
+    version = "3.87.1"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

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

@@ -368,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()
@@ -380,12 +385,10 @@ 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:
                             # No worker picked this task up before being canceled.
                             if self.cancel_abandoned_task(task, TASK_STATES.CANCELED):

{pulpcore-3.87.0 → pulpcore-3.87.1}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.87.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

{pulpcore-3.87.0 → pulpcore-3.87.1}/pyproject.toml

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