X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/95e5ccacf6c1193b313fa90a6d39baafa2ba67d8..9f57bcbab5b244365ca4d0ece8490d7540c72b86:/lib/controller/handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 25799aae9e..53125ae554 100644
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -5,6 +5,7 @@
 package controller
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"net"
@@ -49,6 +50,12 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			req.URL.Path = strings.Replace(req.URL.Path, "//", "/", -1)
 		}
 	}
+	if h.Cluster.HTTPRequestTimeout > 0 {
+		ctx, cancel := context.WithDeadline(req.Context(), time.Now().Add(time.Duration(h.Cluster.HTTPRequestTimeout)))
+		req = req.WithContext(ctx)
+		defer cancel()
+	}
+
 	h.handlerStack.ServeHTTP(w, req)
 }
 
@@ -68,23 +75,20 @@ func (h *Handler) setup() {
 	})
 	hs := http.NotFoundHandler()
 	hs = prepend(hs, h.proxyRailsAPI)
-	hs = prepend(hs, h.proxyRemoteCluster)
+	hs = h.setupProxyRemoteCluster(hs)
 	mux.Handle("/", hs)
 	h.handlerStack = mux
 
 	sc := *arvados.DefaultSecureClient
-	sc.Timeout = time.Duration(h.Cluster.HTTPRequestTimeout)
 	sc.CheckRedirect = neverRedirect
 	h.secureClient = &sc
 
 	ic := *arvados.InsecureHTTPClient
-	ic.Timeout = time.Duration(h.Cluster.HTTPRequestTimeout)
 	ic.CheckRedirect = neverRedirect
 	h.insecureClient = &ic
 
 	h.proxy = &proxy{
-		Name:           "arvados-controller",
-		RequestTimeout: time.Duration(h.Cluster.HTTPRequestTimeout),
+		Name: "arvados-controller",
 	}
 }
 
@@ -121,11 +125,10 @@ func prepend(next http.Handler, middleware middlewareFunc) http.Handler {
 	})
 }
 
-func (h *Handler) proxyRailsAPI(w http.ResponseWriter, req *http.Request, next http.Handler) {
+func (h *Handler) localClusterRequest(req *http.Request) (*http.Response, error) {
 	urlOut, insecure, err := findRailsAPI(h.Cluster, h.NodeProfile)
 	if err != nil {
-		httpserver.Error(w, err.Error(), http.StatusInternalServerError)
-		return
+		return nil, err
 	}
 	urlOut = &url.URL{
 		Scheme:   urlOut.Scheme,
@@ -138,7 +141,15 @@ func (h *Handler) proxyRailsAPI(w http.ResponseWriter, req *http.Request, next h
 	if insecure {
 		client = h.insecureClient
 	}
-	h.proxy.Do(w, req, urlOut, client)
+	return h.proxy.Do(req, urlOut, client)
+}
+
+func (h *Handler) proxyRailsAPI(w http.ResponseWriter, req *http.Request, next http.Handler) {
+	resp, err := h.localClusterRequest(req)
+	n, err := h.proxy.ForwardResponse(w, resp, err)
+	if err != nil {
+		httpserver.Logger(req).WithError(err).WithField("bytesCopied", n).Error("error copying response body")
+	}
 }
 
 // For now, findRailsAPI always uses the rails API running on this