From 3f9ff10786b879a02750780936b50271e675ea57 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 12:46:36 +0200
Subject: [PATCH] ThreadPool: catch Interrupted

---
 src/libutil/thread-pool.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index 0355e1f07..57172da7e 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -110,6 +110,11 @@ void ThreadPool::doWork(bool mainThread)
                            propagate it. */
                         try {
                             std::rethrow_exception(exc);
+                        } catch (const Interrupted &) {
+                            // The interrupted state may be picked up multiple
+                            // workers, which is expected, so we should ignore
+                            // it silently and let the first one bubble up,
+                            // rethrown via the original state->exception.
                         } catch (std::exception & e) {
                             if (!dynamic_cast<ThreadPoolShutDown*>(&e))
                                 ignoreExceptionExceptInterrupt();