github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22930 from AdoHe/change_global_timeout

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-16 01:44:02 -07:00
parent 17d8e61244 28e1d1af65
commit 22e3e79c53
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/validator.go
View File

@@ -26,7 +26,7 @@ import (
) )
const ( const (
probeTimeOut = time.Minute probeTimeOut = 20 * time.Second
) )
// TODO: this basic interface is duplicated in N places. consolidate? // TODO: this basic interface is duplicated in N places. consolidate?

3
pkg/genericapiserver/genericapiserver.go
View File

@@ -58,6 +58,7 @@ import (
const ( const (
DefaultEtcdPathPrefix = "/registry" DefaultEtcdPathPrefix = "/registry"
globalTimeout = time.Minute
) )
// StorageDestinations is a mapping from API group & resource to // StorageDestinations is a mapping from API group & resource to
@@ -662,7 +663,7 @@ func (s *GenericAPIServer) Run(options *ServerRunOptions) {
if longRunningRequestCheck(req) { if longRunningRequestCheck(req) {
return nil, "" return nil, ""
} }
return time.After(time.Minute), "" return time.After(globalTimeout), ""
} }
if secureLocation != "" { if secureLocation != "" {