make request timeout configurable

SwissDataScienceCenter · Jun 21, 2022 · 42bd578 · 42bd578
1 parent 7a3c84e
commit 42bd578
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/helm-chart/renku-core/templates/configmap.yaml b/helm-chart/renku-core/templates/configmap.yaml
@@ -7,6 +7,8 @@ data:
     {{- range $version := .Values.versions }}
     upstream {{ $version.name }} {
       server {{ include "renku-core.fullname" $ }}-{{ $version.name }};
+      keepalive 32;
+      keepalive_timeout {{ $.Values.requestTimeout }};s
     }
     {{ end }}
 
@@ -30,12 +32,22 @@ data:
         rewrite /renku/{{ $version.prefix }}/(.*) /renku/$1  break;
         proxy_set_header Host $host;
         proxy_pass http://{{ $version.name }};
+        proxy_connect_timeout {{ $.Values.requestTimeout }}s;
+        proxy_send_timeout {{ $.Values.requestTimeout }}s;
+        proxy_read_timeout {{ $.Values.requestTimeout }}s;
+        proxy_http_version 1.1;
+        proxy_set_header "Connection" "";
       }
       {{- end }}
 
       location /renku {
         proxy_set_header Host $host;
         proxy_pass http://{{ .Values.versions.latest.name }};
+        proxy_connect_timeout {{ $.Values.requestTimeout }}s;
+        proxy_send_timeout {{ $.Values.requestTimeout }}s;
+        proxy_read_timeout {{ $.Values.requestTimeout }}s;
+        proxy_http_version 1.1;
+        proxy_set_header "Connection" "";
       }
     }
   version.json: |

diff --git a/helm-chart/renku-core/templates/deployment.yaml b/helm-chart/renku-core/templates/deployment.yaml
@@ -106,6 +106,8 @@ spec:
               value: {{ $.Values.templateCloneDepth | quote }}
             - name: MAX_CONTENT_LENGTH
               value: {{ $.Values.maximumUploadSizeBytes | quote }}
+            - name: REQUEST_TIMEOUT
+              value: {{ $.Values.requestTimeout | quote }}
             - name: CORE_SERVICE_PREFIX
               value: /renku
             - name: CORE_SERVICE_API_BASE_PATH

diff --git a/helm-chart/renku-core/values.schema.json b/helm-chart/renku-core/values.schema.json
@@ -32,6 +32,10 @@
         "minimum": 1,
         "pattern": "^\\d+"
       },
+      "requestTimeout": {
+        "description": "Time before requests time out.",
+        "type": "integer"
+      },
       "datasetsWorkerQueues": {
         "description": "Name of the worker queue for dataset jobs",
         "type": "string"

diff --git a/helm-chart/renku-core/values.yaml b/helm-chart/renku-core/values.yaml
@@ -40,6 +40,7 @@ cleanupInterval: 60  # NOTE: This needs to be a divisor of, and less than cleanu
 projectCloneDepth: 1
 templateCloneDepth: 1
 maximumUploadSizeBytes: "1073741824" # 1 Gigabyte, store as string to keep Helm from converting it to scientific notation
+requestTimeout: 600
 
 datasetsWorkerQueues: datasets.jobs,delayed.ctrl.DatasetsCreateCtrl,delayed.ctrl.DatasetsAddFileCtrl,delayed.ctrl.DatasetsRemoveCtrl,delayed.ctrl.DatasetsImportCtrl,delayed.ctrl.DatasetsEditCtrl,delayed.ctrl.DatasetsUnlinkCtrl
 managementWorkerQueues: cache.cleanup.files,cache.cleanup.projects,delayed.ctrl.MigrateProjectCtrl,delayed.ctrl.SetConfigCtrl

diff --git a/renku/ui/cli/service.py b/renku/ui/cli/service.py
@@ -44,6 +44,8 @@ def run_api(addr="0.0.0.0", port=8080, timeout=600):
     svc_num_workers = os.getenv("RENKU_SVC_NUM_WORKERS", "1")
     svc_num_threads = os.getenv("RENKU_SVC_NUM_THREADS", "2")
 
+    svc_timeout = int(os.getenv("REQUEST_TIMEOUT", timeout))
+
     loading_opt = "--preload"
 
     sys.argv = [
@@ -53,7 +55,7 @@ def run_api(addr="0.0.0.0", port=8080, timeout=600):
         "-b",
         f"{addr}:{port}",
         "--timeout",
-        f"{timeout}",
+        f"{svc_timeout}",
         "--workers",
         svc_num_workers,
         "--worker-class",