bpo-33097: Fix submit accepting callable after executor shutdown by interpreter exit. (GH-6144)

Executors in concurrent.futures accepted tasks after executor was
shutdown by interpreter exit. Tasks were left in PENDING state forever.
This fix changes submit to instead raise a RuntimeError.

Author: mrknmc

Lib/concurrent/futures/process.py

@@ -591,7 +591,7 @@ def submit(self, fn, *args, **kwargs):
         with self._shutdown_lock:
             if self._broken:
                 raise BrokenProcessPool(self._broken)
-            if self._shutdown_thread:
+            if _global_shutdown or self._shutdown_thread:
                 raise RuntimeError('cannot schedule new futures after shutdown')
 
             f = _base.Future()

Lib/concurrent/futures/thread.py

@@ -143,7 +143,7 @@ def submit(self, fn, *args, **kwargs):
             if self._broken:
                 raise BrokenThreadPool(self._broken)
 
-            if self._shutdown:
+            if _shutdown or self._shutdown:
                 raise RuntimeError('cannot schedule new futures after shutdown')
 
             f = _base.Future()

Lib/test/test_concurrent_futures.py

@@ -303,6 +303,33 @@ def test_interpreter_shutdown(self):
         self.assertFalse(err)
         self.assertEqual(out.strip(), b"apple")
 
+    def test_submit_after_interpreter_shutdown(self):
+        # Test the atexit hook for shutdown of worker threads and processes
+        rc, out, err = assert_python_ok('-c', """if 1:
+            import atexit
+            @atexit.register
+            def run_last():
+                try:
+                    t.submit(lambda: None)
+                except RuntimeError:
+                    print("runtime-error")
+                    raise
+            from concurrent.futures import {executor_type}
+            if __name__ == "__main__":
+                context = '{context}'
+                if context == "":
+                    t = {executor_type}(5)
+                else:
+                    from multiprocessing import get_context
+                    context = get_context(context)
+                    t = {executor_type}(5, mp_context=context)
+            """.format(executor_type=self.executor_type.__name__,
+                       context=getattr(self, "ctx", "")))
+        # Errors in atexit hooks don't change the process exit code, check
+        # stderr manually.
+        self.assertTrue(err)
+        self.assertEqual(out.strip(), b"runtime-error")
+
     def test_hang_issue12364(self):
         fs = [self.executor.submit(time.sleep, 0.1) for _ in range(50)]
         self.executor.shutdown()

Misc/NEWS.d/next/Library/2018-03-18-16-48-23.bpo-33097.Yl4gI2.rst

@@ -0,0 +1,2 @@
+Raise RuntimeError when ``executor.submit`` is called during interpreter
+shutdown.