Increased default timeout in APIServer to 2 minutes

This should for kubernetes#5431
duda · Mar 14, 2015 · ffcf7b1 · ffcf7b1
1 parent 5326bae
commit ffcf7b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
@@ -258,7 +258,8 @@ func parseTimeout(str string) time.Duration {
 		}
 		glog.Errorf("Failed to parse %q: %v", str, err)
 	}
-	return 30 * time.Second
+	// TODO: change back to 30s once #5180 is fixed
+	return 2 * time.Minute
 }
 
 func readBody(req *http.Request) ([]byte, error) {

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