reduce component status probe timeout to 20s for quickly timeout

This commit is contained in:
AdoHe 2016-03-14 22:18:55 -04:00
parent ddcee7b89b
commit 28e1d1af65
2 changed files with 3 additions and 2 deletions

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?

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 != "" {