changeset:   105575:f3b9fd41b5cb
branch:      3.6
parent:      105572:f9e0c864157c
parent:      105574:1a955981b263
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Sat Dec 10 17:16:17 2016 +0100
files:       Lib/multiprocessing/context.py Lib/multiprocessing/spawn.py Lib/test/_test_multiprocessing.py Misc/NEWS
description:
Issue #28779: multiprocessing.set_forkserver_preload() would crash the forkserver process if a preloaded module instantiated some multiprocessing objects such as locks.


diff -r f9e0c864157c -r f3b9fd41b5cb Lib/multiprocessing/context.py
--- a/Lib/multiprocessing/context.py	Sat Dec 10 16:45:53 2016 +0100
+++ b/Lib/multiprocessing/context.py	Sat Dec 10 17:16:17 2016 +0100
@@ -196,7 +196,7 @@
     def get_start_method(self, allow_none=False):
         return self._name
 
-    def set_start_method(self, method=None):
+    def set_start_method(self, method, force=False):
         raise ValueError('cannot set start method of concrete context')
 
     @property
diff -r f9e0c864157c -r f3b9fd41b5cb Lib/multiprocessing/spawn.py
--- a/Lib/multiprocessing/spawn.py	Sat Dec 10 16:45:53 2016 +0100
+++ b/Lib/multiprocessing/spawn.py	Sat Dec 10 17:16:17 2016 +0100
@@ -217,7 +217,7 @@
         process.ORIGINAL_DIR = data['orig_dir']
 
     if 'start_method' in data:
-        set_start_method(data['start_method'])
+        set_start_method(data['start_method'], force=True)
 
     if 'init_main_from_name' in data:
         _fixup_main_from_name(data['init_main_from_name'])
diff -r f9e0c864157c -r f3b9fd41b5cb Lib/test/_test_multiprocessing.py
--- a/Lib/test/_test_multiprocessing.py	Sat Dec 10 16:45:53 2016 +0100
+++ b/Lib/test/_test_multiprocessing.py	Sat Dec 10 17:16:17 2016 +0100
@@ -3818,6 +3818,19 @@
             self.assertTrue(methods == ['fork', 'spawn'] or
                             methods == ['fork', 'spawn', 'forkserver'])
 
+    def test_preload_resources(self):
+        if multiprocessing.get_start_method() != 'forkserver':
+            self.skipTest("test only relevant for 'forkserver' method")
+        name = os.path.join(os.path.dirname(__file__), 'mp_preload.py')
+        rc, out, err = test.support.script_helper.assert_python_ok(name)
+        out = out.decode()
+        err = err.decode()
+        if out.rstrip() != 'ok' or err != '':
+            print(out)
+            print(err)
+            self.fail("failed spawning forkserver or grandchild")
+
+
 #
 # Check that killing process does not leak named semaphores
 #
diff -r f9e0c864157c -r f3b9fd41b5cb Lib/test/mp_preload.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Lib/test/mp_preload.py	Sat Dec 10 17:16:17 2016 +0100
@@ -0,0 +1,18 @@
+import multiprocessing
+
+multiprocessing.Lock()
+
+
+def f():
+    print("ok")
+
+
+if __name__ == "__main__":
+    ctx = multiprocessing.get_context("forkserver")
+    modname = "test.mp_preload"
+    # Make sure it's importable
+    __import__(modname)
+    ctx.set_forkserver_preload([modname])
+    proc = ctx.Process(target=f)
+    proc.start()
+    proc.join()
diff -r f9e0c864157c -r f3b9fd41b5cb Misc/NEWS
--- a/Misc/NEWS	Sat Dec 10 16:45:53 2016 +0100
+++ b/Misc/NEWS	Sat Dec 10 17:16:17 2016 +0100
@@ -22,6 +22,10 @@
 Library
 -------
 
+- Issue #28779: multiprocessing.set_forkserver_preload() would crash the
+  forkserver process if a preloaded module instantiated some
+  multiprocessing objects such as locks.
+
 - Issue #28847: dbm.dumb now supports reading read-only files and no longer
   writes the index file when it is not changed.