X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8d73164d5ca50e7af1b3752b4251eaf9f11a9fc8..86074c13f4441fa0804e30a1d68781175ba32e0d:/lib/controller/handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 0c31815cba..775d290347 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)
 }
 
@@ -65,6 +72,7 @@ func (h *Handler) setup() {
 	mux.Handle("/_health/", &health.Handler{
 		Token:  h.Cluster.ManagementToken,
 		Prefix: "/_health/",
+		Routes: health.Routes{"ping": func() error { _, err := h.db(&http.Request{}); return err }},
 	})
 	hs := http.NotFoundHandler()
 	hs = prepend(hs, h.proxyRailsAPI)
@@ -73,18 +81,15 @@ func (h *Handler) setup() {
 	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,14 +126,10 @@ func prepend(next http.Handler, middleware middlewareFunc) http.Handler {
 	})
 }
 
-// localClusterRequest sets up a request so it can be proxied to the
-// local API server using proxy.Do().  Returns true if a response was
-// written, false if not.
-func (h *Handler) localClusterRequest(w http.ResponseWriter, req *http.Request, filter ResponseFilter) bool {
+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 true
+		return nil, err
 	}
 	urlOut = &url.URL{
 		Scheme:   urlOut.Scheme,
@@ -141,12 +142,14 @@ func (h *Handler) localClusterRequest(w http.ResponseWriter, req *http.Request,
 	if insecure {
 		client = h.insecureClient
 	}
-	return h.proxy.Do(w, req, urlOut, client, filter)
+	return h.proxy.Do(req, urlOut, client)
 }
 
 func (h *Handler) proxyRailsAPI(w http.ResponseWriter, req *http.Request, next http.Handler) {
-	if !h.localClusterRequest(w, req, nil) && next != nil {
-		next.ServeHTTP(w, req)
+	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")
 	}
 }