gh-136655: ensure cancelled futures are notified on process pool shutdown

Author: duaneg

Lib/concurrent/futures/process.py

@@ -518,7 +518,9 @@ def flag_executor_shutting_down(self):
                 # to only have futures that are currently running.
                 new_pending_work_items = {}
                 for work_id, work_item in self.pending_work_items.items():
-                    if not work_item.future.cancel():
+                    if work_item.future.cancel():
+                        work_item.future.set_running_or_notify_cancel()
+                    else:
                         new_pending_work_items[work_id] = work_item
                 self.pending_work_items = new_pending_work_items
                 # Drain work_ids_queue since we no longer need to

Lib/test/test_concurrent_futures/executor.py

@@ -233,3 +233,25 @@ def test_swallows_falsey_exceptions(self):
         msg = 'lenlen'
         with self.assertRaisesRegex(FalseyLenException, msg):
             self.executor.submit(raiser, FalseyLenException, msg).result()
+
+    def test_shutdown_notifies_cancelled_futures(self):
+        # gh-136655: ensure cancelled futures are notified
+        count = self.worker_count * 2
+        barrier = self.create_barrier(self.worker_count + 1)
+        fs = [self.executor.submit(blocking_raiser,
+                                   barrier if index < self.worker_count else None)
+              for index in range(count)]
+
+        self.executor.shutdown(wait=False, cancel_futures=True)
+        barrier.wait()
+
+        for future in fs:
+            self.assertRaises((FalseyBoolException, futures.CancelledError),
+                              future.result)
+
+        self.assertIn('CANCELLED_AND_NOTIFIED', [f._state for f in fs])
+
+def blocking_raiser(barrier=None):
+    if barrier is not None:
+        barrier.wait(1)
+    raise FalseyBoolException()

Lib/test/test_concurrent_futures/util.py

@@ -79,6 +79,9 @@ def get_context(self):
 class ThreadPoolMixin(ExecutorMixin):
     executor_type = futures.ThreadPoolExecutor
 
+    def create_barrier(self, count):
+        return threading.Barrier(count)
+
     def create_event(self):
         return threading.Event()
 
@@ -87,6 +90,9 @@ def create_event(self):
 class InterpreterPoolMixin(ExecutorMixin):
     executor_type = futures.InterpreterPoolExecutor
 
+    def create_barrier(self, count):
+        self.skipTest("InterpreterPoolExecutor doesn't support barriers")
+
     def create_event(self):
         self.skipTest("InterpreterPoolExecutor doesn't support events")
 
@@ -106,6 +112,9 @@ def get_context(self):
             self.skipTest("TSAN doesn't support threads after fork")
         return super().get_context()
 
+    def create_barrier(self, count):
+        return self.manager.Barrier(count)
+
     def create_event(self):
         return self.manager.Event()
 
@@ -121,6 +130,9 @@ def get_context(self):
             self.skipTest("ProcessPoolExecutor unavailable on this system")
         return super().get_context()
 
+    def create_barrier(self, count):
+        return self.manager.Barrier(count)
+
     def create_event(self):
         return self.manager.Event()
 
@@ -140,6 +152,9 @@ def get_context(self):
             self.skipTest("TSAN doesn't support threads after fork")
         return super().get_context()
 
+    def create_barrier(self, count):
+        return self.manager.Barrier(count)
+
     def create_event(self):
         return self.manager.Event()