From 1bea8a71f7f3aabb256ed4654b9f345fdcc4bc3d Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 2 May 2024 17:31:21 +0200
Subject: [PATCH] Cancel ProcessPoolFuture when aborting job

Fixes the occasional timeout error in jobs that follow the
`test_abort_fetch_job` test.
---
 lib/galaxy/celery/tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/galaxy/celery/tasks.py b/lib/galaxy/celery/tasks.py
index fc60f692132..657ae3ef909 100644
--- a/lib/galaxy/celery/tasks.py
+++ b/lib/galaxy/celery/tasks.py
@@ -288,6 +288,7 @@ def abort_when_job_stops(function: Callable, session: galaxy_scoped_session, job
                 return future.result(timeout=1)
             except TimeoutError:
                 if is_aborted(session, job_id):
+                    future.cancel()
                     return