Skip to content

Commit 2c24c86

Browse files
aiskmiss-islington
authored andcommitted
gh-109263: Start process from spawn context in multiprocessing no longer have side effect (GH-135813)
(cherry picked from commit c2202a7) Co-authored-by: AN Long <aisk@users.noreply.github.com>
1 parent c5852c2 commit 2c24c86

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

Lib/multiprocessing/spawn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def get_preparation_data(name):
184184
sys_argv=sys.argv,
185185
orig_dir=process.ORIGINAL_DIR,
186186
dir=os.getcwd(),
187-
start_method=get_start_method(),
187+
start_method=get_start_method(allow_none=True),
188188
)
189189

190190
# Figure out whether to initialise main in the subprocess as a module

Lib/test/_test_multiprocessing.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5689,6 +5689,26 @@ def test_context(self):
56895689
self.assertRaises(ValueError, ctx.set_start_method, None)
56905690
self.check_context(ctx)
56915691

5692+
@staticmethod
5693+
def _dummy_func():
5694+
pass
5695+
5696+
@warnings_helper.ignore_fork_in_thread_deprecation_warnings()
5697+
def test_spawn_dont_set_context(self):
5698+
# Run a process with spawn or forkserver context may change
5699+
# the global start method, see gh-109263.
5700+
for method in ('fork', 'spawn', 'forkserver'):
5701+
multiprocessing.set_start_method(None, force=True)
5702+
5703+
try:
5704+
ctx = multiprocessing.get_context(method)
5705+
except ValueError:
5706+
continue
5707+
process = ctx.Process(target=self._dummy_func)
5708+
process.start()
5709+
process.join()
5710+
self.assertIsNone(multiprocessing.get_start_method(allow_none=True))
5711+
56925712
def test_context_check_module_types(self):
56935713
try:
56945714
ctx = multiprocessing.get_context('forkserver')
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Starting a process from spawn context in :mod:`multiprocessing` no longer
2+
sets the start method globally.

0 commit comments

Comments
 (0)