Skip to content

bpo-36368: Ignore SIGINT in SharedMemoryManager servers. #12483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 11 commits into from
May 10, 2019
Merged

bpo-36368: Ignore SIGINT in SharedMemoryManager servers. #12483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf84e10
FIX protect shared_memory server from SIGINT
pierreglaser Mar 19, 2019
d861f46
TST test SharedMemoryManager after KeyboardInterrupt
pierreglaser Mar 21, 2019
2525a4b
MNT news section
pierreglaser Mar 21, 2019
0987b23
CLN typo
pierreglaser Mar 21, 2019
7fa69e9
CLN remove unnecessary unlink command
pierreglaser Mar 21, 2019
e3aa9c5
FIX handle correct interruption signal in windows
pierreglaser Mar 21, 2019
10892dc
FIX skip test on windows
pierreglaser Mar 22, 2019
1316b8b
TST widen skip condition to non-posix platforms
pierreglaser Mar 27, 2019
37efd99
TST test that signal changes dont affect parent
pierreglaser Mar 27, 2019
74f9438
CLN typo
pierreglaser Mar 27, 2019
01a1c0f
CLN bad indentation
pierreglaser Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/multiprocessing/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import sys
import threading
import signal
import array
import queue
import time
Expand Down Expand Up @@ -596,6 +597,9 @@ def _run_server(cls, registry, address, authkey, serializer, writer,
'''
Create a server, report its address and run it
'''
# bpo-36368: protect server process from KeyboardInterrupt signals
signal.signal(signal.SIGINT, signal.SIG_IGN)

if initializer is not None:
initializer(*initargs)

Expand Down
24 changes: 24 additions & 0 deletions Lib/test/_test_multiprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3734,6 +3734,30 @@ def test_shared_memory_across_processes(self):

sms.close()

@unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms")
def test_shared_memory_SharedMemoryServer_ignores_sigint(self):
# bpo-36368: protect SharedMemoryManager server process from
# KeyboardInterrupt signals.
smm = multiprocessing.managers.SharedMemoryManager()
smm.start()

# make sure the manager works properly at the beginning
sl = smm.ShareableList(range(10))

# the manager's server should ignore KeyboardInterrupt signals, and
# maintain its connection with the current process, and success when
# asked to deliver memory segments.
os.kill(smm._process.pid, signal.SIGINT)

sl2 = smm.ShareableList(range(10))

# test that the custom signal handler registered in the Manager does
# not affect signal handling in the parent process.
with self.assertRaises(KeyboardInterrupt):
os.kill(os.getpid(), signal.SIGINT)

smm.shutdown()

def test_shared_memory_SharedMemoryManager_basics(self):
smm1 = multiprocessing.managers.SharedMemoryManager()
with self.assertRaises(ValueError):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-03-21-16-00-00.bpo-36368.zsRT1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a bug crashing SharedMemoryManager instances in interactive sessions after
a ctrl-c (KeyboardInterrupt) was sent