Merge pull request kubernetes#8741 from justinsb/e2e_set_http_timeout

thockin · thockin · commit 7480c8263a67 · 2015-05-27T12:43:18.000-07:00
e2e: Set (short) timeout for http request polling
diff --git a/test/e2e/service.go b/test/e2e/service.go
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1091,12 +1091,14 @@ func testNotReachable(ip string, port int) {`
`1091`	`1091`
`1092`	`1092`	`// Does an HTTP GET, but does not reuse TCP connections`
`1093`	`1093`	`// This masks problems where the iptables rule has changed, but we don't see it`
	`1094`	`+// This is intended for relatively quick requests (status checks), so we set a short (5 seconds) timeout`
`1094`	`1095`	`func httpGetNoConnectionPool(url string) (*http.Response, error) {`
`1095`	`1096`	`tr := &http.Transport{`
`1096`	`1097`	`DisableKeepAlives: true,`
`1097`	`1098`	`}`
`1098`	`1099`	`client := &http.Client{`
`1099`	`1100`	`Transport: tr,`
	`1101`	`+ Timeout: 5 * time.Second,`
`1100`	`1102`	`}`
`1101`	`1103`
`1102`	`1104`	`return client.Get(url)`