X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc1c9a3d80a5fc71142ad11f4eda05c26e351569..e23f03950b82e72de23c4c44112785a9e92ea235:/services/keep-web/server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index b0375ff8d9..24f1b77be2 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -10,7 +10,6 @@ import (
 	"net/http"
 
 	"git.arvados.org/arvados.git/sdk/go/arvados"
-	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
@@ -21,14 +20,19 @@ type server struct {
 	Config *Config
 }
 
-func (srv *server) Start(logger *logrus.Logger) error {
+func (srv *server) Start(ctx context.Context, logger *logrus.Logger) error {
 	h := &handler{Config: srv.Config}
 	reg := prometheus.NewRegistry()
 	h.Config.Cache.registry = reg
+	// Warning: when updating this to use Command() from
+	// lib/service, make sure to implement an exemption in
+	// httpserver.HandlerWithDeadline() so large file uploads are
+	// allowed to take longer than the usual API.RequestTimeout.
+	// See #13697.
 	mh := httpserver.Instrument(reg, logger, httpserver.AddRequestIDs(httpserver.LogRequests(h)))
 	h.MetricsAPI = mh.ServeAPI(h.Config.cluster.ManagementToken, http.NotFoundHandler())
 	srv.Handler = mh
-	srv.BaseContext = func(net.Listener) context.Context { return ctxlog.Context(context.Background(), logger) }
+	srv.BaseContext = func(net.Listener) context.Context { return ctx }
 	var listen arvados.URL
 	for listen = range srv.Config.cluster.Services.WebDAV.InternalURLs {
 		break