New option --network-timeout

python/README.md

@@ -79,6 +79,7 @@ Name | Description|
 |_\--show-traceback_|Show python traceback on error, useful for debugging the tool.|
 |_--color \[yes | no | auto]_|Color mode.|
 |_\--disable-pypi-version-check_|Don't periodically check PyPI to determine whether a new version of Neuromation CLI is available for download.|
+|_\--network-timeout FLOAT_|Network read timeout, seconds.|
 |_--version_|Show the version and exit.|
 |_--help_|Show this message and exit.|
 

python/neuromation/cli/main.py

@@ -98,6 +98,9 @@ def print_options(
     help="Don't periodically check PyPI to determine whether a new version of "
     "Neuromation CLI is available for download.",
 )
+@click.option(
+    "--network-timeout", type=float, help="Network read timeout, seconds.", default=60.0
+)
 @click.version_option(
     version=neuromation.__version__, message="Neuromation Platform Client %(version)s"
 )
@@ -117,6 +120,7 @@ def cli(
     show_traceback: bool,
     color: str,
     disable_pypi_version_check: bool,
+    network_timeout: float,
 ) -> None:
     #   ▇ ◣
     #   ▇ ◥ ◣
@@ -143,6 +147,7 @@ def cli(
     config.tty = tty
     config.terminal_size = shutil.get_terminal_size()
     config.disable_pypi_version_check = disable_pypi_version_check
+    config.network_timeout = network_timeout
     ctx.obj = config
     if not disable_pypi_version_check:
         config.pypi.warn_if_has_newer_version()

python/neuromation/cli/rc.py

@@ -77,6 +77,7 @@ class Config:
     tty: bool = field(default=False)  # don't save the field in config
     terminal_size: Tuple[int, int] = field(default=(80, 24))  # don't save it in config
     disable_pypi_version_check: bool = False  # don't save it in config
+    network_timeout: float = 30.0
 
     @property
     def auth(self) -> Optional[str]:
@@ -107,6 +108,10 @@ def make_client(self, *, timeout: Optional[aiohttp.ClientTimeout] = None) -> Cli
         kwargs: Dict[str, Any] = {}
         if timeout is not None:
             kwargs["timeout"] = timeout
+        else:
+            kwargs["timeout"] = aiohttp.ClientTimeout(
+                None, None, self.network_timeout, self.network_timeout
+            )
         if self.registry_url:
             kwargs["registry_url"] = self.registry_url
         return Client(self.url, token, **kwargs)

python/neuromation/client/api.py

@@ -10,7 +10,7 @@
 
 log = logging.getLogger(__name__)
 
-DEFAULT_TIMEOUT = aiohttp.ClientTimeout(None, None, 30, 30)
+DEFAULT_TIMEOUT = aiohttp.ClientTimeout(None, None, 60, 60)
 
 
 class ClientError(Exception):

python/tests/e2e/conftest.py

@@ -42,6 +42,7 @@
 JOB_OUTPUT_TIMEOUT = 60 * 5
 JOB_OUTPUT_SLEEP_SECONDS = 2
 STORAGE_MAX_WAIT = 60
+NETWORK_TIMEOUT = 60.0 * 3
 
 DUMMY_PROGRESS = ProgressBase.create_progress(False)
 
@@ -387,6 +388,7 @@ def _temp_config():
                             "--show-traceback",
                             "--disable-pypi-version-check",
                             "--color=no",
+                            f"--network-timeout={self.config.network_timeout}",
                         ]
                         + arguments
                     )
@@ -487,6 +489,8 @@ def _temp_config():
             config = rc.ConfigFactory.load()
     else:
         config = rc.ConfigFactory.load()
+
+    config.network_timeout = NETWORK_TIMEOUT
     yield config
 
 
@@ -515,6 +519,8 @@ def _temp_config():
             config = rc.ConfigFactory.load()
     else:
         pytest.skip("CLIENT_TEST_E2E_USER_NAME_ALT variable is not set")
+
+    config.network_timeout = NETWORK_TIMEOUT
     yield config