Merge pull request #31016 from krousey/tcp_reuse

Automatic merge from submit-queue Attempt to ensure entire resp body is read **What this PR does / why we need it**: Enables the re-use of TCP connections when code fails to read the entire body of the response. **Which issue this PR fixes**: fixes #30975 **Special notes for your reviewer**: This is a best effort approach. It only attempts to drain the body of the response if it's less than 1k. It seems like a reasonable barrier at which to give up and just use a new TCP connection. cc: @wojtek-t @smarterclayton @lavalamp @kubernetes/sig-api-machinery

Merge pull request #31016 from krousey/tcp_reuse
a157e28e · Kubernetes Submit Queue · GitHub · 982640f7 · 35c69500 · a157e28e
Commit a157e28e authored Aug 19, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

request.go pkg/client/restclient/request.go +10 -3

No files found.
--- a/pkg/client/restclient/request.go
+++ b/pkg/client/restclient/request.go
@@ -821,9 +821,16 @@ func (r *Request) request(fn func(*http.Request, *http.Response)) error {
 		}

 		done := func() bool {
-			// ensure the response body is closed before we reconnect, so that we reuse the same
-			// TCP connection
-			defer resp.Body.Close()
+			// Ensure the response body is fully read and closed
+			// before we reconnect, so that we reuse the same TCP
+			// connection.
+			defer func() {
+				const maxBodySlurpSize = 2 << 10
+				if resp.ContentLength <= maxBodySlurpSize {
+					io.Copy(ioutil.Discard, &io.LimitedReader{R: resp.Body, N: maxBodySlurpSize})
+				}
+				resp.Body.Close()
+			}()

 			retries++
 			if seconds, wait := checkWait(resp); wait && retries < maxRetries {