github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13563 from a-robinson/timeout 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-09-09 18:52:14 -07:00
parent 434f05c0e3 4b47cb93f3
commit 950e5d9a53
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apiserver/apiserver.go
View File

@ -345,8 +345,7 @@ func parseTimeout(str string) time.Duration {
}
glog.Errorf("Failed to parse %q: %v", str, err)
}
// TODO: change back to 30s once #5180 is fixed
return 2 * time.Minute
return 30 * time.Second
}
func readBody(req *http.Request) ([]byte, error) {

4
pkg/apiserver/apiserver_test.go
View File

@ -2145,10 +2145,10 @@ func TestUpdateChecksDecode(t *testing.T) {
}
func TestParseTimeout(t *testing.T) {
if d := parseTimeout(""); d != 2*time.Minute {
if d := parseTimeout(""); d != 30*time.Second {
t.Errorf("blank timeout produces %v", d)
}
if d := parseTimeout("not a timeout"); d != 2*time.Minute {
if d := parseTimeout("not a timeout"); d != 30*time.Second {
t.Errorf("bad timeout produces %v", d)
}
if d := parseTimeout("10s"); d != 10*time.Second {