Actually retry retryable status codes (#1618)

jonjohnsonjr · web-flow · commit e2620e56504c · 2023-03-29T09:09:17.000-07:00
diff --git a/pkg/v1/remote/transport/error.go b/pkg/v1/remote/transport/error.go
@@ -34,6 +34,9 @@ type Error struct {
 	Request *http.Request
 	// The raw body if we couldn't understand it.
 	rawBody string
+
+	// Bit of a hack to make it easier to force a retry.
+	temporary bool
 }
 
 // Check that Error implements error
@@ -72,6 +75,10 @@ func (e *Error) responseErr() string {
 
 // Temporary returns whether the request that preceded the error is temporary.
 func (e *Error) Temporary() bool {
+	if e.temporary {
+		return true
+	}
+
 	if len(e.Errors) == 0 {
 		_, ok := temporaryStatusCodes[e.StatusCode]
 		return ok
@@ -153,21 +160,37 @@ func CheckError(resp *http.Response, codes ...int) error {
 			return nil
 		}
 	}
+
 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
 
+	return makeError(resp, b)
+}
+
+func makeError(resp *http.Response, body []byte) *Error {
 	// https://github.com/docker/distribution/blob/master/docs/spec/api.md#errors
 	structuredError := &Error{}
 
 	// This can fail if e.g. the response body is not valid JSON. That's fine,
 	// we'll construct an appropriate error string from the body and status code.
-	_ = json.Unmarshal(b, structuredError)
+	_ = json.Unmarshal(body, structuredError)
 
-	structuredError.rawBody = string(b)
+	structuredError.rawBody = string(body)
 	structuredError.StatusCode = resp.StatusCode
 	structuredError.Request = resp.Request
 
 	return structuredError
 }
+
+func retryError(resp *http.Response) error {
+	b, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	rerr := makeError(resp, b)
+	rerr.temporary = true
+	return rerr
+}
diff --git a/pkg/v1/remote/transport/retry.go b/pkg/v1/remote/transport/retry.go
@@ -100,7 +100,7 @@ func (t *retryTransport) RoundTrip(in *http.Request) (out *http.Response, err er
 		if out != nil {
 			for _, code := range t.codes {
 				if out.StatusCode == code {
-					return CheckError(out)
+					return retryError(out)
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func (t retryTransport) RoundTrip(in http.Request) (out *http.Response, err er`
`100`	`100`	`if out != nil {`
`101`	`101`	`for _, code := range t.codes {`
`102`	`102`	`if out.StatusCode == code {`
`103`		`- return CheckError(out)`
	`103`	`+ return retryError(out)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`