Issue 5177: use socket.SO_REUSEADDR on multiprocessing SocketManager sockets
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 1f05658..59beaa0 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -214,6 +214,7 @@
'''
def __init__(self, address, family, backlog=1):
self._socket = socket.socket(getattr(socket, family))
+ self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self._socket.bind(address)
self._socket.listen(backlog)
self._address = self._socket.getsockname()
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 8f34a1e..76bd3ed 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1189,6 +1189,30 @@
del queue
manager.shutdown()
+class _TestManagerRestart(BaseTestCase):
+
+ def _putter(self, address, authkey):
+ manager = QueueManager(
+ address=address, authkey=authkey, serializer=SERIALIZER)
+ manager.connect()
+ queue = manager.get_queue()
+ queue.put('hello world')
+
+ def test_rapid_restart(self):
+ authkey = os.urandom(32)
+ manager = QueueManager(
+ address=('localhost', 9999), authkey=authkey, serializer=SERIALIZER)
+ manager.start()
+
+ p = self.Process(target=self._putter, args=(manager.address, authkey))
+ p.start()
+ queue = manager.get_queue()
+ self.assertEqual(queue.get(), 'hello world')
+ manager.shutdown()
+ manager = QueueManager(
+ address=('localhost', 9999), authkey=authkey, serializer=SERIALIZER)
+ manager.start()
+
#
#
#
diff --git a/Misc/NEWS b/Misc/NEWS
index c395d06..1de2458 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -197,6 +197,10 @@
Library
-------
+- Issue #5177: Multiprocessing's SocketListener class now uses
+ socket.SO_REUSEADDR on all connections so that the user no longer needs
+ to wait 120 seconds for the socket to expire.
+
- Adjusted _tkinter to compile without warnings when WITH_THREAD is not
defined (part of issue #5035).