19972: Disable auto-retry in diagnostics and rpc.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index d5763d9ef9bb9ad85a6395bb6c51a7651e53df3e..fe0fca6b8cabf06a4430e78ab0976559b79aa71e 100644 (file)
--- 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 ed963e1ef75b42439ed1e23fef7d11e9a62a695c..36dca86e59c2f284efcec4f7a0beb7dce6530974 100644 (file)
--- 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")