girder-worker 5.0.20.dev8__tar.gz → 5.0.21.dev2__tar.gz

{girder_worker-5.0.20.dev8 → girder_worker-5.0.21.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-worker
-Version: 5.0.20.dev8
+Version: 5.0.21.dev2
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.

{girder_worker-5.0.20.dev8 → girder_worker-5.0.21.dev2}/girder_worker/docker/tasks/__init__.py

@@ -468,6 +468,13 @@ def _docker_run(task, image, pull_image=True, entrypoint=None, container_args=No
             else:
                 container.remove()
 
+    # A canceled container was stopped before it wrote its outputs, so skip the
+    # result hooks rather than failing the job on the missing files.  The select
+    # loop has already recorded any cancel it saw, so check that record rather
+    # than querying the worker again.
+    if getattr(task.request, '_girder_worker_canceled', False) is True:
+        return ()
+
     # return an array of None's equal to number of entries in the girder_result_hooks
     # header, in order to trigger processing of the container outputs.
     results = []

{girder_worker-5.0.20.dev8 → girder_worker-5.0.21.dev2}/girder_worker/task.py

@@ -115,10 +115,16 @@ class Task(celery.Task):
         """
         A property to indicate if a task has been canceled.
 
+        Once a cancel has been observed it is remembered for the rest of the
+        request: the revoked list is fetched from the worker on every check,
+        and a later fetch that times out must not un-cancel the task.
+
         :return: True is this task has been canceled, False otherwise.
         :rtype: bool
         """
-        return is_revoked(self)
+        if getattr(self.request, '_girder_worker_canceled', False) is not True:
+            self.request._girder_worker_canceled = is_revoked(self)
+        return self.request._girder_worker_canceled
 
     def describe(self):
         return describe_function(self.run)

{girder_worker-5.0.20.dev8 → girder_worker-5.0.21.dev2}/girder_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-worker
-Version: 5.0.20.dev8
+Version: 5.0.21.dev2
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.

girder_worker-5.0.21.dev2/girder_worker.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.20",
+  "distance": 2,
+  "node": "ga6954f59751db96fe599cb58fbabeef6e558a9c1",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-10-26"
+}

girder_worker-5.0.20.dev8/girder_worker.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.0.19",
-  "distance": 8,
-  "node": "g41aad97df0a4e9c3deffd2d67b15017fc2a8b41c",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-10-22"
-}