From 295fab4892d81336b71c49a6d0a4ec6e790e6e7a Mon Sep 17 00:00:00 2001 From: Matthew Jaffee Date: Wed, 22 Dec 2021 12:21:11 -0600 Subject: [PATCH] retry on >= 400, not just greater. good catch --- ctl/restore.go | 2 +- http/client.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctl/restore.go b/ctl/restore.go index d0c0b7ec7..f7d669f09 100644 --- a/ctl/restore.go +++ b/ctl/restore.go @@ -179,7 +179,7 @@ func (cmd *RestoreCommand) restoreSchema(ctx context.Context, primary *topology. } func retryWith400(ctx context.Context, resp *http.Response, err error) (bool, error) { - if resp != nil && resp.StatusCode > 400 { // we have some dumb status codes + if resp != nil && resp.StatusCode >= 400 { // we have some dumb status codes return true, nil } return retryablehttp.DefaultRetryPolicy(ctx, resp, err) diff --git a/http/client.go b/http/client.go index 7f7374d4d..222499794 100644 --- a/http/client.go +++ b/http/client.go @@ -90,7 +90,7 @@ func noRetryPolicy(ctx context.Context, resp *http.Response, err error) (bool, e // therefore useless to retry, but we have some incorrect status codes. // TODO: fix the incorrect status codes so we can get rid of this. func retryWith400Policy(ctx context.Context, resp *http.Response, err error) (bool, error) { - if resp != nil && resp.StatusCode > 400 { + if resp != nil && resp.StatusCode >= 400 { return true, nil } return retryablehttp.DefaultRetryPolicy(ctx, resp, err)