github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86685 from yangl900/stop-retry-bad-request

Browse Source 
Azure cloud provider should not retry on bad request
This commit is contained in:
Kubernetes Prow Robot 2019-12-28 04:17:39 -08:00 committed by GitHub
commit 0a496e3860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,9 @@ func getHTTPStatusCode(resp *http.Response) int {
// shouldRetryHTTPRequest determines if the request is retriable. // shouldRetryHTTPRequest determines if the request is retriable.
func shouldRetryHTTPRequest(resp *http.Response, err error) bool { func shouldRetryHTTPRequest(resp *http.Response, err error) bool {
if resp != nil { if resp != nil {
// HTTP 412 (StatusPreconditionFailed) means etag mismatch, hence we shouldn't retry. // HTTP 412 (StatusPreconditionFailed) means etag mismatch
if resp.StatusCode == http.StatusPreconditionFailed { // HTTP 400 (BadRequest) means the request cannot be accepted, hence we shouldn't retry.
if resp.StatusCode == http.StatusPreconditionFailed || resp.StatusCode == http.StatusBadRequest {
return false return false
} }

6
staging/src/k8s.io/legacy-cloud-providers/azure/retry/azure_error_test.go
View File

@ -54,7 +54,7 @@ func TestGetError(t *testing.T) {
{ {
code: http.StatusBadRequest, code: http.StatusBadRequest,
expected: &Error{ expected: &Error{
Retriable: true, Retriable: false,
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
RawError: fmt.Errorf("HTTP response: 400"), RawError: fmt.Errorf("HTTP response: 400"),
}, },
@ -136,7 +136,7 @@ func TestGetStatusNotFoundAndForbiddenIgnoredError(t *testing.T) {
{ {
code: http.StatusBadRequest, code: http.StatusBadRequest,
expected: &Error{ expected: &Error{
Retriable: true, Retriable: false,
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
RawError: fmt.Errorf("HTTP response: 400"), RawError: fmt.Errorf("HTTP response: 400"),
}, },
@ -191,7 +191,7 @@ func TestShouldRetryHTTPRequest(t *testing.T) {
}{ }{
{ {
code: http.StatusBadRequest, code: http.StatusBadRequest,
expected: true, expected: false,
}, },
{ {
code: http.StatusInternalServerError, code: http.StatusInternalServerError,