Issue #15101: Make pool finalizer avoid joining current thread.

shibturn · shibturn · commit f29ec4b0c89b · 2012-06-18T15:54:57.000+01:00
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
@@ -493,7 +493,8 @@ def _terminate_pool(cls, taskqueue, inqueue, outqueue, pool,
         # We must wait for the worker handler to exit before terminating
         # workers because we don't want workers to be restarted behind our back.
         debug('joining worker handler')
-        worker_handler.join()
+        if threading.current_thread() is not worker_handler:
+            worker_handler.join()
 
         # Terminate workers which haven't already finished.
         if pool and hasattr(pool[0], 'terminate'):
@@ -503,10 +504,12 @@ def _terminate_pool(cls, taskqueue, inqueue, outqueue, pool,
                     p.terminate()
 
         debug('joining task handler')
-        task_handler.join()
+        if threading.current_thread() is not task_handler:
+            task_handler.join()
 
         debug('joining result handler')
-        result_handler.join()
+        if threading.current_thread() is not result_handler:
+            result_handler.join()
 
         if pool and hasattr(pool[0], 'terminate'):
             debug('joining pool workers')
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -70,6 +70,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #15101: Make pool finalizer avoid joining current thread.
+
 - Issue #15036: Mailbox no longer throws an error if a flush is done
   between operations when removing or changing multiple items in mbox,
   MMDF, or Babyl mailboxes.
