github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix azure retry issue when return 2XX with error

Browse Source 
fix comments
This commit is contained in:
andyzhangx
2019-05-24 12:47:08 +00:00
parent 4884873160
commit 8a45ba1981
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go
View File

@@ -596,8 +596,9 @@ func shouldRetryHTTPRequest(resp *http.Response, err error) bool {
return false 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) { 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 // HTTP 2xx suggests a successful response
return true, nil return true, nil
} }
@@ -620,7 +621,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 { 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 // HTTP 2xx suggests a successful response
return nil return nil
} }

5
staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff_test.go
View File

@@ -119,6 +119,11 @@ func TestProcessRetryResponse(t *testing.T) {
code: http.StatusOK, code: http.StatusOK,
stop: true, stop: true,
}, },
{
code: http.StatusOK,
err: fmt.Errorf("some error"),
stop: false,
},
{ {
code: 399, code: 399,
stop: true, stop: true,