mitogen/parent: Make the timeout configurable

-SSH command size: 894
+SSH command size: 905

                         Original           Minimized           Compressed
-mitogen.parent        99034  96.7KiB  51295 50.1KiB 51.8%  12970 12.7KiB 13.1%
+mitogen.parent        99212  96.9KiB  51385 50.2KiB 51.8%  12999 12.7KiB 13.1%

Signed-off-by: Marc Hartmayer <[email protected]>

Author: mhartmay

mitogen/parent.py

@@ -1378,6 +1378,9 @@ class Connection(object):
     #: user.
     exception = None
 
+    #: First stage timeout in seconds.
+    _first_stage_timeout = 10
+
     #: Extra text appended to :class:`EofError` if that exception is raised on
     #: a failed connection attempt. May be used in subclasses to hint at common
     #: problems with a particular connection method.
@@ -1419,6 +1422,7 @@ def __repr__(self):
     #   n: size of the compressed core source to be read
     #   V: data chunk
     #   rl: list of FDs ready for reading
+    #   t: timeout value in seconds
     #   _: throw away variable
 
     # Final os.close(STDOUT_FILENO) to avoid --py-debug build corrupting stream with
@@ -1442,10 +1446,11 @@ def _first_stage():
             os.execl(sys.executable,sys.executable+'(mitogen:%s)'%sys.argv[2])
         os.write(1,'MITO000\n'.encode())
         n=int(sys.argv[3])
+        t=float(sys.argv[4])
         C=''.encode()
         V='V'
         while n>len(C) and V:
-            rl,_,_=select.select([0],[],[],10)
+            rl,_,_=select.select([0],[],[],t)
             if not rl:
                 raise Exception("TimeoutError")
             V=os.read(0,n-len(C))
@@ -1495,6 +1500,7 @@ def get_boot_command(self):
             encoded.decode(),
             self.options.remote_name,
             str(len(self.get_preamble())),
+            str(self._first_stage_timeout),
         ]
 
     def get_econtext_config(self):

tests/first_stage_test.py

@@ -158,6 +158,8 @@ def test_timeout_error(self):
         options = mitogen.parent.Options(max_message_size=123)
         conn = mitogen.parent.Connection(options, self.router)
         conn.context = mitogen.core.Context(None, 123)
+        # We do not want to wait the default of 10s, change it to 0.3s
+        conn._first_stage_timeout = 0.3
         args = conn.get_boot_command()
 
         # The boot command should write an ECO marker to stdout, read the