Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend timeout to allow for observed slow proxy requests #22955

Merged
merged 1 commit into from
Mar 15, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions test/e2e/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ const (
// Only print this many characters of the response (to keep the logs
// legible).
maxDisplayBodyLen = 100

// We have seen one of these calls take just over 15 seconds, so putting this at 30.
proxyHTTPCallTimeout = 30 * time.Second
)

func proxyContext(version string) {
Expand Down Expand Up @@ -228,8 +231,8 @@ func proxyContext(version string) {
if e, a := val, string(body); e != a {
recordError(fmt.Sprintf("%v: path %v: wanted %v, got %v", i, path, e, a))
}
if d > 15*time.Second {
recordError(fmt.Sprintf("%v: path %v took %v > 15s", i, path, d))
if d > proxyHTTPCallTimeout {
recordError(fmt.Sprintf("%v: path %v took %v > %v", i, path, d, proxyHTTPCallTimeout))
}
}(i, path, val)
// default QPS is 5
Expand Down Expand Up @@ -295,7 +298,7 @@ func nodeProxyTest(f *Framework, prefix, nodeDest string) {
} else {
Expect(err).NotTo(HaveOccurred())
Expect(status).To(Equal(http.StatusOK))
Expect(d).To(BeNumerically("<", 15*time.Second))
Expect(d).To(BeNumerically("<", proxyHTTPCallTimeout))
}
}
if serviceUnavailableErrors > 0 {
Expand Down