X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c013f919b5db9336833dbe855349600449a993d..7ea5b1b2b78ceaa326d8f21ce1d08df0be1d9cda:/sdk/go/arvados/client.go

diff --git a/sdk/go/arvados/client.go b/sdk/go/arvados/client.go
index 05176214ae..d1a87e30e8 100644
--- a/sdk/go/arvados/client.go
+++ b/sdk/go/arvados/client.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"git.arvados.org/arvados.git/sdk/go/httpserver"
+	"github.com/hashicorp/go-retryablehttp"
 )
 
 // A Client is an HTTP client with an API endpoint and a set of
@@ -65,9 +66,11 @@ type Client struct {
 
 	// Timeout for requests. NewClientFromConfig and
 	// NewClientFromEnv return a Client with a default 5 minute
-	// timeout.  To disable this timeout and rely on each
-	// http.Request's context deadline instead, set Timeout to
-	// zero.
+	// timeout. Within this time, retryable errors are
+	// automatically retried with exponential backoff.
+	//
+	// To disable automatic retries, set Timeout to zero and use a
+	// context deadline to establish a maximum request time.
 	Timeout time.Duration
 
 	dd *DiscoveryDocument
@@ -229,9 +232,11 @@ func NewClientFromEnv() *Client {
 
 var reqIDGen = httpserver.IDGenerator{Prefix: "req-"}
 
-// Do adds Authorization and X-Request-Id headers, delays in order to
-// comply with rate-limiting restrictions, and then calls
-// (*http.Client)Do().
+var nopCancelFunc context.CancelFunc = func() {}
+
+// Do augments (*http.Client)Do(): adds Authorization and X-Request-Id
+// headers, delays in order to comply with rate-limiting restrictions,
+// and retries failed requests when appropriate.
 func (c *Client) Do(req *http.Request) (*http.Response, error) {
 	ctx := req.Context()
 	if auth, _ := ctx.Value(contextKeyAuthorization{}).(string); auth != "" {
@@ -255,39 +260,82 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
 			req.Header.Set("X-Request-Id", reqid)
 		}
 	}
-	var cancel context.CancelFunc
+
+	rreq, err := retryablehttp.FromRequest(req)
+	if err != nil {
+		return nil, err
+	}
+
+	cancel := nopCancelFunc
+	var lastResp *http.Response
+	var lastRespBody io.ReadCloser
+	var lastErr error
+
+	rclient := retryablehttp.NewClient()
+	rclient.HTTPClient = c.httpClient()
 	if c.Timeout > 0 {
+		rclient.RetryWaitMax = c.Timeout / 10
+		rclient.RetryMax = 32
 		ctx, cancel = context.WithDeadline(ctx, time.Now().Add(c.Timeout))
-		req = req.WithContext(ctx)
+		rreq = rreq.WithContext(ctx)
 	} else {
-		cancel = context.CancelFunc(func() {})
+		rclient.RetryMax = 0
+	}
+	rclient.CheckRetry = func(ctx context.Context, resp *http.Response, respErr error) (bool, error) {
+		if c.requestLimiter.Report(resp, respErr) {
+			c.last503.Store(time.Now())
+		}
+		if c.Timeout == 0 {
+			return false, err
+		}
+		retrying, err := retryablehttp.DefaultRetryPolicy(ctx, resp, respErr)
+		if retrying {
+			lastResp, lastRespBody, lastErr = resp, nil, respErr
+			if respErr == nil {
+				// Save the response and body so we
+				// can return it instead of "deadline
+				// exceeded". retryablehttp.Client
+				// will drain and discard resp.body,
+				// so we need to stash it separately.
+				buf, err := ioutil.ReadAll(resp.Body)
+				if err == nil {
+					lastRespBody = io.NopCloser(bytes.NewReader(buf))
+				} else {
+					lastResp, lastErr = nil, err
+				}
+			}
+		}
+		return retrying, err
 	}
+	rclient.Logger = nil
 
 	c.requestLimiter.Acquire(ctx)
 	if ctx.Err() != nil {
 		c.requestLimiter.Release()
+		cancel()
 		return nil, ctx.Err()
 	}
-
-	// Attach Release() to cancel func, see cancelOnClose below.
-	cancelOrig := cancel
-	cancel = func() {
-		c.requestLimiter.Release()
-		cancelOrig()
-	}
-
-	resp, err := c.httpClient().Do(req)
-	if c.requestLimiter.Report(resp, err) {
-		c.last503.Store(time.Now())
+	resp, err := rclient.Do(rreq)
+	if (errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled)) && (lastResp != nil || lastErr != nil) {
+		resp, err = lastResp, lastErr
+		if resp != nil {
+			resp.Body = lastRespBody
+		}
 	}
-	if err == nil {
-		// We need to call cancel() eventually, but we can't
-		// use "defer cancel()" because the context has to
-		// stay alive until the caller has finished reading
-		// the response body.
-		resp.Body = cancelOnClose{ReadCloser: resp.Body, cancel: cancel}
-	} else {
+	if err != nil {
+		c.requestLimiter.Release()
 		cancel()
+		return nil, err
+	}
+	// We need to call cancel() eventually, but we can't use
+	// "defer cancel()" because the context has to stay alive
+	// until the caller has finished reading the response body.
+	resp.Body = cancelOnClose{
+		ReadCloser: resp.Body,
+		cancel: func() {
+			c.requestLimiter.Release()
+			cancel()
+		},
 	}
 	return resp, err
 }