[ARVADOS] updated: 2.1.0-1404-gfbbafc5ec

[Git user]

Summary of changes:
 lib/controller/auth_test.go                    |  8 ++--
 lib/controller/federation_test.go              |  8 ++--
 lib/controller/server_test.go                  |  8 ++--
 lib/service/cmd.go                             |  5 +-
 sdk/go/httpserver/logger.go                    | 41 +++++++++++++++--
 sdk/go/httpserver/logger_test.go               | 63 ++++++++++++++++++++++++--
 services/api/config/arvados_config.rb          |  1 +
 services/api/config/initializers/db_timeout.rb |  9 ++++
 services/keep-web/server.go                    | 10 +++-
 9 files changed, 133 insertions(+), 20 deletions(-)
 create mode 100644 services/api/config/initializers/db_timeout.rb

       via  fbbafc5ecb48485913cec69d9dd45ffd42c99cef (commit)
       via  747de7f566c347eeff252b98c9aa09271e7fa24a (commit)
       via  fdd3dd304439a7912db1c6ef257cf512ec7b3b52 (commit)
       via  fc1c9a3d80a5fc71142ad11f4eda05c26e351569 (commit)
       via  2b8fc576e242c0b8658eef9f1130143e009efc4d (commit)
       via  d90f02c0e969b649da61fdd272a9aab69c487de3 (commit)
      from  190273b4931aff39d7aba26cf7e7e7e6be1242ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fbbafc5ecb48485913cec69d9dd45ffd42c99cef
Merge: 190273b49 747de7f56
Author: Tom Clegg <tom at curii.com>
Date:   Thu Sep 23 17:01:53 2021 -0400

    Merge branch '13697-database-timeout'
    
    fixes #13697
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 747de7f566c347eeff252b98c9aa09271e7fa24a
Author: Tom Clegg <tom at curii.com>
Date:   Thu Sep 23 17:01:09 2021 -0400

    13967: Add guard comment re timing out large uploads.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index b0375ff8d..586f6b805 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

-----------------------------------------------------------------------


hooks/post-receive
--