Merge pull request #8741 from justinsb/e2e_set_http_timeout

e2e: Set (short) timeout for http request polling
This commit is contained in:
Tim Hockin
2015-05-27 12:43:18 -07:00

View File

@@ -1091,12 +1091,14 @@ func testNotReachable(ip string, port int) {
// Does an HTTP GET, but does not reuse TCP connections
// This masks problems where the iptables rule has changed, but we don't see it
// This is intended for relatively quick requests (status checks), so we set a short (5 seconds) timeout
func httpGetNoConnectionPool(url string) (*http.Response, error) {
tr := &http.Transport{
DisableKeepAlives: true,
}
client := &http.Client{
Transport: tr,
Timeout: 5 * time.Second,
}
return client.Get(url)