Merge pull request #78422 from andyzhangx/automated-cherry-pick-of-#7…

…8298-upstream-release-1.14 Automated cherry pick of #78298: fix azure retry issue when return 2XX with error
kubernetes · May 31, 2019 · 801f4e7 · 801f4e7
2 parents 0096daf + 74a785b
commit 801f4e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/cloudprovider/providers/azure/azure_backoff.go b/pkg/cloudprovider/providers/azure/azure_backoff.go
@@ -552,8 +552,9 @@ func shouldRetryHTTPRequest(resp *http.Response, err error) bool {
 	return false
 }
 
+// processHTTPRetryResponse : return true means stop retry, false means continue retry
 func (az *Cloud) processHTTPRetryResponse(service *v1.Service, reason string, resp *http.Response, err error) (bool, error) {
-	if resp != nil && isSuccessHTTPResponse(resp) {
+	if err == nil && resp != nil && isSuccessHTTPResponse(resp) {
 		// HTTP 2xx suggests a successful response
 		return true, nil
 	}
@@ -576,7 +577,7 @@ func (az *Cloud) processHTTPRetryResponse(service *v1.Service, reason string, re
 }
 
 func (az *Cloud) processHTTPResponse(service *v1.Service, reason string, resp *http.Response, err error) error {
-	if isSuccessHTTPResponse(resp) {
+	if err == nil && isSuccessHTTPResponse(resp) {
 		// HTTP 2xx suggests a successful response
 		return nil
 	}

diff --git a/pkg/cloudprovider/providers/azure/azure_backoff_test.go b/pkg/cloudprovider/providers/azure/azure_backoff_test.go
@@ -119,6 +119,11 @@ func TestProcessRetryResponse(t *testing.T) {
 			code: http.StatusOK,
 			stop: true,
 		},
+		{
+			code: http.StatusOK,
+			err:  fmt.Errorf("some error"),
+			stop: false,
+		},
 		{
 			code: 399,
 			stop: true,