From 6421b0ad951105405ccca6c381723ce9d3d3a3d6 Mon Sep 17 00:00:00 2001 From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de> Date: Mon, 16 Oct 2023 14:28:45 +0200 Subject: [PATCH] update timeouts --- ...yterProxy-Matlab-0.8.0-GCCcore-11.3.0-2023.3.6.eb | 6 ++++-- .../jupytermatlabproxy_timeout.patch | 12 ++++++++++++ .../j/JupyterProxy-Matlab/matlabproxy_timeout.patch | 12 ++++++++++++ Golden_Repo/j/JupyterProxy-Matlab/timeout.patch | 12 ------------ 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 Golden_Repo/j/JupyterProxy-Matlab/jupytermatlabproxy_timeout.patch create mode 100644 Golden_Repo/j/JupyterProxy-Matlab/matlabproxy_timeout.patch delete mode 100644 Golden_Repo/j/JupyterProxy-Matlab/timeout.patch diff --git a/Golden_Repo/j/JupyterProxy-Matlab/JupyterProxy-Matlab-0.8.0-GCCcore-11.3.0-2023.3.6.eb b/Golden_Repo/j/JupyterProxy-Matlab/JupyterProxy-Matlab-0.8.0-GCCcore-11.3.0-2023.3.6.eb index 638aa574..cfacda00 100644 --- a/Golden_Repo/j/JupyterProxy-Matlab/JupyterProxy-Matlab-0.8.0-GCCcore-11.3.0-2023.3.6.eb +++ b/Golden_Repo/j/JupyterProxy-Matlab/JupyterProxy-Matlab-0.8.0-GCCcore-11.3.0-2023.3.6.eb @@ -59,21 +59,23 @@ exts_list = [ ('matlab-proxy', '0.8.0', { 'patches': [ 'noVersionCheck.patch', + 'matlabproxy_timeout.patch', ], 'checksums': [ ('sha256', '965b0b7cfa6314638435089f211106c114b838e8f4945cb5f5dacb15c0cdf71f'), ('sha256', 'c21ba8969da77c88a266c97dc73dc64dc7a8f4fc20391f311bb4a6992d6e812c'), + ('sha256', '4f7d9f67566496223f01156f168e02af61b6b0a441afcaf7258b08f6ec79762d'), ], }), ('jupyter-matlab-proxy', '0.8.0', { 'source_urls': ['https://github.com/mathworks/jupyter-matlab-proxy/archive/'], 'source_tmpl': 'v%(version)s.tar.gz', 'patches': [ - 'timeout.patch', + 'jupytermatlabproxy_timeout.patch', ], 'checksums': [ ('sha256', 'b1785c8bed32d187c2fa15d921d047dd7483ec20442cdc5f34c0aad1ca06bac5'), - ('sha256', 'f44b7eee2d73b492a885c6b051b755330ff973e083d341933d28172156f0ff16'), + ('sha256', '4d15cc52352dc0cdeb03cc01285cf01cfe01393f3eee77fe1c2e205d691a5b8d'), ], }), ] diff --git a/Golden_Repo/j/JupyterProxy-Matlab/jupytermatlabproxy_timeout.patch b/Golden_Repo/j/JupyterProxy-Matlab/jupytermatlabproxy_timeout.patch new file mode 100644 index 00000000..bd1e4cf7 --- /dev/null +++ b/Golden_Repo/j/JupyterProxy-Matlab/jupytermatlabproxy_timeout.patch @@ -0,0 +1,12 @@ +diff -Naur 0.8.0.orig/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.8.0/src/jupyter_matlab_proxy/__init__.py 0.8.0/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.8.0/src/jupyter_matlab_proxy/__init__.py +--- 0.8.0.orig/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.8.0/src/jupyter_matlab_proxy/__init__.py 2023-10-16 13:08:25.138590609 +0200 ++++ 0.8.0/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.8.0/src/jupyter_matlab_proxy/__init__.py 2023-10-16 12:55:47.863830331 +0200 +@@ -93,7 +93,7 @@ + "--config", + config["extension_name"], + ], +- "timeout": 100, ++ "timeout": 1800, + "environment": _get_env, + "absolute_url": True, + "launcher_entry": {"title": "Open MATLAB", "icon_path": icon_path}, diff --git a/Golden_Repo/j/JupyterProxy-Matlab/matlabproxy_timeout.patch b/Golden_Repo/j/JupyterProxy-Matlab/matlabproxy_timeout.patch new file mode 100644 index 00000000..a3fdc0a6 --- /dev/null +++ b/Golden_Repo/j/JupyterProxy-Matlab/matlabproxy_timeout.patch @@ -0,0 +1,12 @@ +diff -Naur 0.8.0.orig/GCCcore-11.3.0-2023.3.6/matlabproxy/matlab-proxy-0.8.0/matlab_proxy/app_state.py 0.8.0/GCCcore-11.3.0-2023.3.6/matlabproxy/matlab-proxy-0.8.0/matlab_proxy/app_state.py +--- 0.8.0.orig/GCCcore-11.3.0-2023.3.6/matlabproxy/matlab-proxy-0.8.0/matlab_proxy/app_state.py 2023-10-16 13:09:23.368725542 +0200 ++++ 0.8.0/GCCcore-11.3.0-2023.3.6/matlabproxy/matlab-proxy-0.8.0/matlab_proxy/app_state.py 2023-10-16 12:57:02.458981541 +0200 +@@ -36,7 +36,7 @@ + MATLAB_PORT_CHECK_DELAY_IN_SECONDS = 1 + # The maximum amount of time in seconds the Embedded Connector can take + # for launching, before the matlab-proxy server concludes that something is wrong. +- EMBEDDED_CONNECTOR_MAX_STARTUP_DURATION_IN_SECONDS = 120 ++ EMBEDDED_CONNECTOR_MAX_STARTUP_DURATION_IN_SECONDS = 600 + + def __init__(self, settings): + """Parameterized constructor for the AppState class. diff --git a/Golden_Repo/j/JupyterProxy-Matlab/timeout.patch b/Golden_Repo/j/JupyterProxy-Matlab/timeout.patch deleted file mode 100644 index 11a1e821..00000000 --- a/Golden_Repo/j/JupyterProxy-Matlab/timeout.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur 0.7.1.orig/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.7.1/src/jupyter_matlab_proxy/__init__.py 0.7.1/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.7.1/src/jupyter_matlab_proxy/__init__.py ---- 0.7.1.orig/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.7.1/src/jupyter_matlab_proxy/__init__.py 2023-08-21 14:27:12.000000000 +0200 -+++ 0.7.1/GCCcore-11.3.0-2023.3.6/jupytermatlabproxy/jupyter-matlab-proxy-0.7.1/src/jupyter_matlab_proxy/__init__.py 2023-08-29 22:16:29.568376240 +0200 -@@ -48,7 +48,7 @@ - "--config", - config["extension_name"], - ], -- "timeout": 100, -+ "timeout": 1800, - "environment": _get_env, - "absolute_url": True, - "launcher_entry": {"title": "Open MATLAB", "icon_path": icon_path}, -- GitLab