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

Do not fail status 200 responses to proxy calls

Browse Source
This commit is contained in:
Satnam Singh 2015-03-03 14:55:56 -08:00
parent 61e38920a5
commit cb4c931b0b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/client/request.go
View File

@ -520,6 +520,7 @@ func (r *Request) DoRaw() ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer r.resp.Body.Close()
// Check to see if we got a 429 Too Many Requests response code. // Check to see if we got a 429 Too Many Requests response code.
if r.resp.StatusCode == errors.StatusTooManyRequests { if r.resp.StatusCode == errors.StatusTooManyRequests {
@ -539,7 +540,6 @@ func (r *Request) DoRaw() ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer r.resp.Body.Close()
return body, err return body, err
} }
} }
@ -600,7 +600,8 @@ func (r *Request) transformResponse(body []byte, resp *http.Response, req *http.
} }
// If the server gave us a status back, look at what it was. // If the server gave us a status back, look at what it was.
if isStatusResponse && status.Status != api.StatusSuccess { success := resp.StatusCode >= http.StatusOK && resp.StatusCode <= http.StatusPartialContent
if isStatusResponse && (status.Status != api.StatusSuccess && !success) {
// "Working" requests need to be handled specially. // "Working" requests need to be handled specially.
// "Failed" requests are clearly just an error and it makes sense to return them as such. // "Failed" requests are clearly just an error and it makes sense to return them as such.
return nil, false, errors.FromObject(&status) return nil, false, errors.FromObject(&status)