Browse Source

Merge pull request #5956 from xiang90/fix_renew

*: fix issue found in fast lease renew
Xiang Li 9 years ago
parent
commit
04155423f5
2 changed files with 4 additions and 0 deletions
  1. 1 0
      lease/leasehttp/http.go
  2. 3 0
      pkg/transport/timeout_transport.go

+ 1 - 0
lease/leasehttp/http.go

@@ -89,6 +89,7 @@ func RenewHTTP(id lease.LeaseID, url string, rt http.RoundTripper, timeout time.
 		return -1, err
 	}
 	b, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
 	if err != nil {
 		return -1, err
 	}

+ 3 - 0
pkg/transport/timeout_transport.go

@@ -34,6 +34,9 @@ func NewTimeoutTransport(info TLSInfo, dialtimeoutd, rdtimeoutd, wtimeoutd time.
 		// the timed out connection will timeout soon after it is idle.
 		// it should not be put back to http transport as an idle connection for future usage.
 		tr.MaxIdleConnsPerHost = -1
+	} else {
+		// allow more idle connections between peers to avoid unncessary port allocation.
+		tr.MaxIdleConnsPerHost = 1024
 	}
 
 	tr.Dial = (&rwTimeoutDialer{