diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-11-21 09:46:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-21 09:46:21 (GMT) |
commit | 713b4bbd97392acc492a4fefb2d07ae61fb7b75d (patch) | |
tree | 30d3c2270e96cc908c5c9cf1a9d3da01871bc87e | |
parent | c1bbca5b004b3f74d240ef8a76ff445cc1a27efb (diff) | |
download | cpython-713b4bbd97392acc492a4fefb2d07ae61fb7b75d.zip cpython-713b4bbd97392acc492a4fefb2d07ae61fb7b75d.tar.gz cpython-713b4bbd97392acc492a4fefb2d07ae61fb7b75d.tar.bz2 |
bpo-40550: Fix time-of-check/time-of-action issue in subprocess.Popen.send_signal. (GH-20010)
send_signal() now swallows the exception if the process it thought was still alive winds up not to exist anymore (always a plausible race condition despite the checks).
Co-authored-by: Gregory P. Smith <greg@krypto.org>
(cherry picked from commit 01a202ab6b0ded546e47073db6498262086c52e9)
Co-authored-by: Filipe LaĆns <lains@archlinux.org>
-rw-r--r-- | Lib/subprocess.py | 6 | ||||
-rw-r--r-- | Lib/test/test_subprocess.py | 13 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-08-21-30-54.bpo-40550.i7GWkb.rst | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 13600c2..f1d829a 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -2061,7 +2061,11 @@ class Popen(object): # The race condition can still happen if the race condition # described above happens between the returncode test # and the kill() call. - os.kill(self.pid, sig) + try: + os.kill(self.pid, sig) + except ProcessLookupError: + # Supress the race condition error; bpo-40550. + pass def terminate(self): """Terminate the process with SIGTERM diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 3735424..7373fe2 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -3160,6 +3160,19 @@ class POSIXProcessTestCase(BaseTestCase): # so Popen failed to read it and uses a default returncode instead. self.assertIsNotNone(proc.returncode) + def test_send_signal_race2(self): + # bpo-40550: the process might exist between the returncode check and + # the kill operation + p = subprocess.Popen([sys.executable, '-c', 'exit(1)']) + + # wait for process to exit + while not p.returncode: + p.poll() + + with mock.patch.object(p, 'poll', new=lambda: None): + p.returncode = None + p.send_signal(signal.SIGTERM) + def test_communicate_repeated_call_after_stdout_close(self): proc = subprocess.Popen([sys.executable, '-c', 'import os, time; os.close(1), time.sleep(2)'], diff --git a/Misc/NEWS.d/next/Library/2020-05-08-21-30-54.bpo-40550.i7GWkb.rst b/Misc/NEWS.d/next/Library/2020-05-08-21-30-54.bpo-40550.i7GWkb.rst new file mode 100644 index 0000000..b0f3f03 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-08-21-30-54.bpo-40550.i7GWkb.rst @@ -0,0 +1 @@ +Fix time-of-check/time-of-action issue in subprocess.Popen.send_signal. |