From: Tom Clegg Date: Thu, 23 Sep 2021 21:01:09 +0000 (-0400) Subject: 13967: Add guard comment re timing out large uploads. X-Git-Tag: 2.3.0~53^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/747de7f566c347eeff252b98c9aa09271e7fa24a 13967: Add guard comment re timing out large uploads. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/services/keep-web/server.go b/services/keep-web/server.go index b0375ff8d9..586f6b8057 100644 --- a/services/keep-web/server.go +++ b/services/keep-web/server.go @@ -25,6 +25,11 @@ func (srv *server) Start(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