Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry

tiborvass · tiborvass · commit 16faf8f1fcc9 · 2016-01-21T15:36:41.000-05:00
Unwrap URL errors on retry
diff --git a/distribution/registry.go b/distribution/registry.go
@@ -145,6 +145,8 @@ func retryOnError(err error) error {
 		case errcode.ErrorCodeUnauthorized, errcode.ErrorCodeUnsupported, errcode.ErrorCodeDenied:
 			return xfer.DoNotRetry{Err: err}
 		}
+	case *url.Error:
+		return retryOnError(v.Err)
 	case *client.UnexpectedHTTPResponseError:
 		return xfer.DoNotRetry{Err: err}
 	}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ func retryOnError(err error) error {`
`145`	`145`	`case errcode.ErrorCodeUnauthorized, errcode.ErrorCodeUnsupported, errcode.ErrorCodeDenied:`
`146`	`146`	`return xfer.DoNotRetry{Err: err}`
`147`	`147`	`}`
	`148`	`+ case *url.Error:`
	`149`	`+ return retryOnError(v.Err)`
`148`	`150`	`case *client.UnexpectedHTTPResponseError:`
`149`	`151`	`return xfer.DoNotRetry{Err: err}`
`150`	`152`	`}`