Commit3d7dfbc

committed

bpo-40550: fix time-of-check/time-of-action issue in multiprocessing

Signed-off-by: Filipe Laíns <lains@archlinux.org>

1 parentd10091a commit3d7dfbcCopy full SHA for 3d7dfbc

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2061,7 +2061,13 @@ def send_signal(self, sig):`
`2061`	`2061`	`# The race condition can still happen if the race condition`
`2062`	`2062`	`# described above happens between the returncode test`
`2063`	`2063`	`# and the kill() call.`
`2064`		`-os.kill(self.pid,sig)`
	`2064`	`+try:`
	`2065`	`+os.kill(self.pid,sig)`
	`2066`	`+exceptProcessLookupErrorase:`
	`2067`	`+# supress the process not found error in case the race`
	`2068`	`+# condition happens, see bpo-40550`
	`2069`	`+ife.errno!=errno.ESRCH:`
	`2070`	`+raisee`
`2065`	`2071`
`2066`	`2072`	`defterminate(self):`
`2067`	`2073`	`"""Terminate the process with SIGTERM`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3145,6 +3145,19 @@ def test_send_signal_race(self):`
`3145`	`3145`	`# so Popen failed to read it and uses a default returncode instead.`
`3146`	`3146`	`self.assertIsNotNone(proc.returncode)`
`3147`	`3147`
	`3148`	`+deftest_send_signal_race2(self):`
	`3149`	`+# bpo-40550: the process might exist between the returncode check and`
	`3150`	`+# the kill operation`
	`3151`	`+p=subprocess.Popen([sys.executable,'-c','exit(1)'])`
	`3152`	`+`
	`3153`	`+# wait for process to exit`
	`3154`	`+whilenotp.returncode:`
	`3155`	`+p.poll()`
	`3156`	`+`
	`3157`	`+withmock.patch.object(p,'poll',new=lambda:None):`
	`3158`	`+p.returncode=None`
	`3159`	`+p.send_signal(signal.SIGTERM)`
	`3160`	`+`
`3148`	`3161`	`deftest_communicate_repeated_call_after_stdout_close(self):`
`3149`	`3162`	`proc=subprocess.Popen([sys.executable,'-c',`
`3150`	`3163`	`'import os, time; os.close(1), time.sleep(2)'],`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix time-of-check/time-of-action issue in subprocess.Popen.send_signal.`

Comments

(0)