fix: extend http download timeout (#369)

Signed-off-by: Miguel Martinez Trivino <miguel@chainloop.dev>
chainloop-dev · Sep 28, 2023 · 42c24bf · 42c24bf
1 parent f5ede4c
commit 42c24bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/app/artifact-cas/configs/config.devel.yaml b/app/artifact-cas/configs/config.devel.yaml
@@ -5,11 +5,13 @@
 server:
   http:
     addr: 0.0.0.0:8001
-    timeout: 5s
+    # Timeouts for http downloads
+    # grpc downloads/uploads don't require this because they don't have timeouts
+    timeout: 300s
   grpc:
     addr: 0.0.0.0:9001
-    # Some cas backends are slow, so we need to increase the timeout
-    # for example, Azure Blob Storage describe takes more than 1 second to respond sometimes
+    # Some unary RPCs are slow, so we need to increase the timeout
+    # For example, Azure Blob Storage describe takes more than 1 second to respond sometimes
     timeout: 5s
   http_metrics:
     addr: 0.0.0.0:5001

diff --git a/app/artifact-cas/internal/service/download.go b/app/artifact-cas/internal/service/download.go
@@ -91,6 +91,10 @@ func (s *DownloadService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// if the buffer contains the actual data we expect we proceed with sending it to the browser
+	// Set headers
+	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", info.FileName))
+	w.Header().Set("Content-Length", strconv.FormatInt(info.Size, 10))
 	s.log.Infow("msg", "download initialized", "digest", wantChecksum, "size", bytefmt.ByteSize(uint64(info.Size)))
 
 	gotChecksum := sha256.New()
@@ -120,11 +124,6 @@ func (s *DownloadService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// if the buffer contains the actual data we expect we proceed with sending it to the browser
-	// Set headers
-	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", info.FileName))
-	w.Header().Set("Content-Length", strconv.FormatInt(info.Size, 10))
-
 	if _, err := io.Copy(w, buf); err != nil {
 		http.Error(w, sl.LogAndMaskErr(err, s.log).Error(), http.StatusInternalServerError)
 		return

diff --git a/deployment/chainloop/Chart.yaml b/deployment/chainloop/Chart.yaml
@@ -4,7 +4,7 @@ description: Chainloop is an open source software supply chain control plane, a
 
 type: application
 # Bump the patch (not minor, not major) version on each change in the Chart Source code
-version: 1.17.1
+version: 1.17.2
 # Do not update appVersion, this is handled automatically by the release process
 appVersion: v0.19.0
 

diff --git a/deployment/chainloop/templates/cas/config.configmap.yaml b/deployment/chainloop/templates/cas/config.configmap.yaml
@@ -9,14 +9,17 @@ data:
     server:
       http:
         addr: 0.0.0.0:8000
-        timeout: 1s
+        # Timeouts for http downloads
+        # grpc downloads/uploads don't require this because they don't have timeouts
+        timeout: 300s
       grpc:
         {{- if .Values.cas.tlsConfig.secret.name  }}
         tls_config:
           certificate: /data/server-certs/tls.crt
           private_key: /data/server-certs/tls.key
         {{- end }}
         addr: 0.0.0.0:9000
+        # Some unary RPCs are slow, so we need to increase the timeout
         timeout: 5s
       http_metrics:
         addr: 0.0.0.0:5000