Commit055a4c2

XD Trol

authored and

Trol

committed

bpo-46391: Library multiprocess leaks named resources.

1 parentf779fac commit055a4c2Copy full SHA for 055a4c2

File tree

+59

-2

lines changed

+59

-2

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,10 @@ class Process(process.BaseProcess):`
`223`	`223`	`def_Popen(process_obj):`
`224`	`224`	`return_default_context.get_context().Process._Popen(process_obj)`
`225`	`225`
	`226`	`+@staticmethod`
	`227`	`+def_bootstrap_util():`
	`228`	`+return_default_context.get_context().Process._bootstrap_util()`
	`229`	`+`
`226`	`230`	`classDefaultContext(BaseContext):`
`227`	`231`	`Process=Process`
`228`	`232`
`@@ -283,6 +287,11 @@ def _Popen(process_obj):`
`283`	`287`	`from .popen_spawn_posiximportPopen`
`284`	`288`	`returnPopen(process_obj)`
`285`	`289`
	`290`	`+@staticmethod`
	`291`	`+def_bootstrap_util():`
	`292`	`+# Process is spawned, no need to bootstrap util.`
	`293`	`+pass`
	`294`	`+`
`286`	`295`	`classForkServerProcess(process.BaseProcess):`
`287`	`296`	`_start_method='forkserver'`
`288`	`297`	`@staticmethod`
`@@ -326,6 +335,11 @@ def _Popen(process_obj):`
`326`	`335`	`from .popen_spawn_win32importPopen`
`327`	`336`	`returnPopen(process_obj)`
`328`	`337`
	`338`	`+@staticmethod`
	`339`	`+def_bootstrap_util():`
	`340`	`+# Process is spawned, no need to bootstrap util.`
	`341`	`+pass`
	`342`	`+`
`329`	`343`	`classSpawnContext(BaseContext):`
`330`	`344`	`_name='spawn'`
`331`	`345`	`Process=SpawnProcess`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,7 @@ def _bootstrap(self, parent_sentinel=None):`
`304`	`304`	`ifthreading._HAVE_THREAD_NATIVE_ID:`
`305`	`305`	`threading.main_thread()._set_native_id()`
`306`	`306`	`try:`
`307`		`-util._finalizer_registry.clear()`
`308`		`-util._run_after_forkers()`
	`307`	`+self._bootstrap_util()`
`309`	`308`	`finally:`
`310`	`309`	`# delay finalization of the old process object until after`
`311`	`310`	`# _run_after_forkers() is executed`
`@@ -336,6 +335,13 @@ def _bootstrap(self, parent_sentinel=None):`
`336`	`335`
`337`	`336`	`returnexitcode`
`338`	`337`
	`338`	`+@staticmethod`
	`339`	`+def_bootstrap_util():`
	`340`	`+from .importutil`
	`341`	`+util._finalizer_registry.clear()`
	`342`	`+util._run_after_forkers()`
	`343`	`+`
	`344`	`+`
`339`	`345`	`#`
`340`	`346`	`# We subclass bytes to avoid accidental transmission of auth keys over network`
`341`	`347`	`#`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5706,6 +5706,41 @@ def test_namespace(self):`
`5706`	`5706`	`self.run_worker(self._test_namespace,o)`
`5707`	`5707`
`5708`	`5708`
	`5709`	`+classTestNamedResource(unittest.TestCase):`
	`5710`	`+`
	`5711`	`+deftest_global_named_resource_spawn(self):`
	`5712`	`+#`
	`5713`	`+# Check that global named resources in main module`
	`5714`	`+# will not leak by a subprocess, in spawn context.`
	`5715`	`+#`
	`5716`	`+importtempfileastf`
	`5717`	`+py=tf.NamedTemporaryFile('w',delete=False)`
	`5718`	`+try:`
	`5719`	`+py.write('''if 1:`
	`5720`	`+ import multiprocessing as mp`
	`5721`	`+`
	`5722`	`+ ctx = mp.get_context('spawn')`
	`5723`	`+`
	`5724`	`+ global_resource = ctx.Semaphore()`
	`5725`	`+`
	`5726`	`+ def submain(): pass`
	`5727`	`+`
	`5728`	`+ if __name__ == '__main__':`
	`5729`	`+ p = ctx.Process(target=submain)`
	`5730`	`+ p.start()`
	`5731`	`+ p.join()`
	`5732`	`+ ''')`
	`5733`	`+py.close()`
	`5734`	`+`
	`5735`	`+p=subprocess.run([sys.executable,py.name],`
	`5736`	`+stderr=subprocess.PIPE,`
	`5737`	`+text=True)`
	`5738`	`+`
	`5739`	`+self.assertNotRegex(p.stderr,'resource_tracker: There appear to be .* leaked')`
	`5740`	`+finally:`
	`5741`	`+os.unlink(py.name)`
	`5742`	`+`
	`5743`	`+`
`5709`	`5744`	`classMiscTestCase(unittest.TestCase):`
`5710`	`5745`	`deftest__all__(self):`
`5711`	`5746`	`# Just make sure names in not_exported are excluded`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix that Library multiprocess leaks named resources when global named`
	`2`	`+resources are used in the main module in spawn context.`

Comments

(0)