Attempt to cancel aborted tasks on worker shutdown

fixes #8987 https://pulp.plan.io/issues/8987
pulp · Jul 2, 2021 · 6da336e · 6da336e
1 parent 4741d10
commit 6da336e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES/8987.bugfix b/CHANGES/8987.bugfix
@@ -0,0 +1 @@
+Added an attempt to cancel a task if a worker needed to abort it on graceful shutdown.
diff --git a/pulpcore/tasking/pulpcore_worker.py b/pulpcore/tasking/pulpcore_worker.py
@@ -206,6 +206,8 @@ def supervise_task(self, task):
                     else:
                         _logger.info(f"Aborting current task {task.pk} due to worker shutdown.")
                         os.kill(task_process.pid, signal.SIGUSR1)
+                        task_process.join()
+                        self.cancel_abandoned_task(task)
                         break
             task_process.join()
         if task.reserved_resources_record: