pulpcore 3.87.0__py3-none-any.whl → 3.87.1__py3-none-any.whl

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

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/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/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.dist-info → pulpcore-3.87.1.dist-info}/METADATA

@@ -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.dist-info → pulpcore-3.87.1.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=xReedwLBMMCFC_Aey1FCvF7NPq1jAFxO9kqD1sPLHaI,297
+pulp_certguard/app/__init__.py,sha256=WYMLvGPITpzrcbTce_stf9R4c2RVL3Hs8tGW0F6Hsbg,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=dibg5uhEg3n9ndMpkjTtaKs3Z3PzNWshY9pHL_noEgU,292
+pulp_file/app/__init__.py,sha256=awSma-p8nw866yBA5QwhiIfCg2XgWpwQ6c-4tYPFC-U,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=0Gsmsyt1r937-0pABimY5Tlj8a2LRkGqFX1bdzfza0M,17412
+pulpcore/app/apps.py,sha256=hBLujC_jOP9ck56_h9jd1-5ROoECvCQZNSa0qfx7niE,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
@@ -339,7 +339,7 @@ pulpcore/tasking/entrypoint.py,sha256=eAypZD4ORoNOrmBeMdbwO9p6GSQ59bMvZ3TrbnE0cz
 pulpcore/tasking/kafka.py,sha256=76z4DzeXM1WL5uu1HlKnduWeLO3-b-czvGBXdWR6054,3845
 pulpcore/tasking/storage.py,sha256=zQkwlpC_FDQtmZGZ8vKwHqxvD6CLO_gAS4Q7wijZE-k,3106
 pulpcore/tasking/tasks.py,sha256=CTlWLCmxP5-HZjo5_KLYIJQu-VKJnzQ5cyL7IFNRMWw,12944
-pulpcore/tasking/worker.py,sha256=n62lnZK2UFQrbLxxv1gUdkya0Z6L9uYW8RQ2HHE1QHM,27190
+pulpcore/tasking/worker.py,sha256=r8Q6hVqmGrnyXFX-RnxMkZUq478lIDLnZxwyd5DeScw,27400
 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
@@ -440,9 +440,9 @@ pulpcore/tests/unit/stages/test_artifactdownloader.py,sha256=qB1ANdFmNtUnljg8fCd
 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.87.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
-pulpcore-3.87.0.dist-info/METADATA,sha256=b93_7typl8xUkhSFLpatjHa_A375x9frLjecSz83IGE,4104
-pulpcore-3.87.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pulpcore-3.87.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
-pulpcore-3.87.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
-pulpcore-3.87.0.dist-info/RECORD,,
+pulpcore-3.87.1.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.87.1.dist-info/METADATA,sha256=YhN-isGK9qpqbwd06ack1JdUajk4oa_7lxe29nqHVGI,4104
+pulpcore-3.87.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pulpcore-3.87.1.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.87.1.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.87.1.dist-info/RECORD,,