16393: keepproxy used cluster.API.KeepServiceRequestTimeout (defaults to

15s) as the timeout on its connection to the keepstores. When a slow client
sends blocks to keepproxy, they get streamed through to keepstore, and
the upload can take more than cluster.API.KeepServiceRequestTimeout
seconds. Update keepproxy to use keepclient.DefaultProxyRequestTimeout
(300s) instead when it connects to the keepstores.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@jhvc.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 547e77e5f510922da5463f5f585f8eb6aa87efbd..188173274f2e40b86f14f6ed00d5b6541c4129e6 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -163,7 +163,7 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
        signal.Notify(term, syscall.SIGINT)
 
        // Start serving requests.
-       router = MakeRESTRouter(kc, time.Duration(cluster.API.KeepServiceRequestTimeout), cluster.ManagementToken)
+       router = MakeRESTRouter(kc, time.Duration(keepclient.DefaultProxyRequestTimeout), cluster.ManagementToken)
        return http.Serve(listener, httpserver.AddRequestIDs(httpserver.LogRequests(router)))
 }