(original) (raw)

changeset: 103835:e9c37e3efcb2 parent: 103832:ac13bf1967b5 parent: 103834:f2fdb624074a user: Yury Selivanov yury@magic.io date: Thu Sep 15 15:46:40 2016 -0400 files: Misc/NEWS description: Merge 3.6 (issue #28174) diff -r ac13bf1967b5 -r e9c37e3efcb2 Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py Thu Sep 15 14:15:29 2016 -0400 +++ b/Lib/asyncio/base_events.py Thu Sep 15 15:46:40 2016 -0400 @@ -76,6 +76,17 @@ return repr(fd) +def _set_reuseport(sock): + if not hasattr(socket, 'SO_REUSEPORT'): + raise ValueError('reuse_port not supported by socket module') + else: + try: + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + except OSError: + raise ValueError('reuse_port not supported by socket module, ' + 'SO_REUSEPORT defined but not implemented.') + + # Linux's sock.type is a bitmask that can include extra info about socket. _SOCKET_TYPE_MASK = 0 if hasattr(socket, 'SOCK_NONBLOCK'): @@ -874,12 +885,7 @@ sock.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) if reuse_port: - if not hasattr(socket, 'SO_REUSEPORT'): - raise ValueError( - 'reuse_port not supported by socket module') - else: - sock.setsockopt( - socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + _set_reuseport(sock) if allow_broadcast: sock.setsockopt( socket.SOL_SOCKET, socket.SO_BROADCAST, 1) @@ -1002,12 +1008,7 @@ sock.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, True) if reuse_port: - if not hasattr(socket, 'SO_REUSEPORT'): - raise ValueError( - 'reuse_port not supported by socket module') - else: - sock.setsockopt( - socket.SOL_SOCKET, socket.SO_REUSEPORT, True) + _set_reuseport(sock) # Disable IPv4/IPv6 dual stack support (enabled by # default on Linux) which makes a single socket # listen on both address families. diff -r ac13bf1967b5 -r e9c37e3efcb2 Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py Thu Sep 15 14:15:29 2016 -0400 +++ b/Lib/test/test_asyncio/test_base_events.py Thu Sep 15 15:46:40 2016 -0400 @@ -1371,6 +1371,17 @@ self.assertRaises(ValueError, self.loop.run_until_complete, f) @patch_socket + def test_create_server_soreuseport_only_defined(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + m_socket.socket.return_value = mock.Mock() + m_socket.SO_REUSEPORT = -1 + + f = self.loop.create_server( + MyProto, '0.0.0.0', 0, reuse_port=True) + + self.assertRaises(ValueError, self.loop.run_until_complete, f) + + @patch_socket def test_create_server_cant_bind(self, m_socket): class Err(OSError): diff -r ac13bf1967b5 -r e9c37e3efcb2 Misc/NEWS --- a/Misc/NEWS Thu Sep 15 14:15:29 2016 -0400 +++ b/Misc/NEWS Thu Sep 15 15:46:40 2016 -0400 @@ -432,6 +432,9 @@ - Issue #27906: Fix socket accept exhaustion during high TCP traffic. Patch by Kevin Conway. +- Issue #28174: Handle when SO_REUSEPORT isn't properly supported. + Patch by Seth Michael Larson. + IDLE ---- /yury@magic.io