From 4aaff900e146c20c9e586223823e8661ce40d7f8 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 1 Mar 2023 15:16:39 -0500 Subject: [PATCH] 19972: Disable auto-retry in diagnostics and rpc. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/rpc/conn.go | 1 + lib/diagnostics/cmd.go | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go index d5763d9ef9..fe0fca6b8c 100644 --- a/lib/controller/rpc/conn.go +++ b/lib/controller/rpc/conn.go @@ -88,6 +88,7 @@ func (conn *Conn) requestAndDecode(ctx context.Context, dst interface{}, ep arva Scheme: conn.baseURL.Scheme, APIHost: conn.baseURL.Host, SendHeader: conn.SendHeader, + Timeout: 0, // disable auto-retry } tokens, err := conn.tokenProvider(ctx) if err != nil { diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go index ed963e1ef7..36dca86e59 100644 --- a/lib/diagnostics/cmd.go +++ b/lib/diagnostics/cmd.go @@ -131,6 +131,7 @@ func (diag *diagnoser) dotest(id int, title string, fn func() error) { func (diag *diagnoser) runtests() { client := arvados.NewClientFromEnv() + client.Timeout = 0 // disable auto-retry, use context instead if client.APIHost == "" || client.AuthToken == "" { diag.errorf("ARVADOS_API_HOST and ARVADOS_API_TOKEN environment variables are not set -- aborting without running any tests") -- 2.30.2