portal 3.1.9__tar.gz → 3.1.11__tar.gz

{portal-3.1.9/portal.egg-info → portal-3.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.9
+Version: 3.1.11
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.9 → portal-3.1.11}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.9'
+__version__ = '3.1.11'
 
 import multiprocessing as mp
 try:

{portal-3.1.9 → portal-3.1.11}/portal/batching.py

@@ -19,6 +19,7 @@ class BatchServer:
       self, port, name='Server', workers=1, errors=True,
       process=True, shmem=False, **kwargs):
     inner_port = utils.free_port()
+    assert port != inner_port, (port, inner_port)
     self.name = name
     self.server = server.Server(inner_port, name, workers, errors, **kwargs)
     if process:

{portal-3.1.9 → portal-3.1.11}/portal/server_socket.py

@@ -48,6 +48,7 @@ class ServerSocket:
       self.addr = (self.options.host, port)
     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     # self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+    self._log(f'Binding to {self.addr[0]}:{self.addr[1]}')
     self.sock.bind(self.addr)
     self.sock.setblocking(False)
     self.sock.listen()
@@ -141,8 +142,11 @@ class ServerSocket:
       conn.recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
     try:
       conn.recvbuf.recv(conn.sock)
-    except ConnectionResetError:
-      self._disconnect(conn)
+    except OSError as e:
+      # For example:
+      # - ConnectionResetError
+      # - TimeoutError: [Errno 110] Connection timed out
+      self._disconnect(conn, e)
       return
     if conn.recvbuf.done():
       if self.recvq.qsize() > self.options.max_recv_queue:
@@ -150,8 +154,10 @@ class ServerSocket:
       self.recvq.put((conn.addr, conn.recvbuf.result()))
       conn.recvbuf = None
 
-  def _disconnect(self, conn):
-    self._log(f'Closed connection to {conn.addr[0]}:{conn.addr[1]}')
+  def _disconnect(self, conn, e):
+    detail = f'{type(e).__name__}'
+    detail = f'{detail}: {e}' if str(e) else detail
+    self._log(f'Closed connection to {conn.addr[0]}:{conn.addr[1]} ({detail})')
     conn = self.conns.pop(conn.addr)
     if conn.sendbufs:
       count = len(conn.sendbufs)

{portal-3.1.9 → portal-3.1.11}/portal/utils.py

@@ -78,13 +78,13 @@ def kill_procs(procs, timeout=3):
       if p.status() != psutil.STATUS_ZOMBIE else None), procs)
 
 
-def free_port():
+def free_port(low=10000, high=50000):
   # Return a port that is currently free. This function is not thread or
   # process safe, because there is no way to guarantee that the port will still
   # be free at the time it will be used.
   rng = np.random.default_rng()
   while True:
-    port = int(rng.integers(2000, 7000))
+    port = int(rng.integers(low, high))
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
       if s.connect_ex(('', port)):
         return port

{portal-3.1.9 → portal-3.1.11/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.9
+Version: 3.1.11
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.9 → portal-3.1.11}/tests/test_batching.py

@@ -110,7 +110,8 @@ class TestBatching:
     client.close()
     server.close()
 
-  def test_shape_mismatch(self):
+  @pytest.mark.parametrize('repeat', range(5))
+  def test_shape_mismatch(self, repeat):
     port = portal.free_port()
     server = portal.BatchServer(port, errors=False)
     server.bind('fn', lambda x: x, batch=2)