From 4dd00be365da6af52d3989d71bef179d36a16c92 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Fri, 2 Jan 2015 10:56:01 -0800 Subject: [PATCH] etcdhttp: reset serve and watch timeout --- etcdserver/etcdhttp/http.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index be33fc84d..c7a889954 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -19,6 +19,7 @@ package etcdhttp import ( "errors" "log" + "math" "net/http" "strings" "time" @@ -29,10 +30,13 @@ import ( const ( // time to wait for response from EtcdServer requests - defaultServerTimeout = 5 * time.Minute + // 5s for disk and network delay + 10*heartbeat for commit and possible + // leader switch + // TODO: use heartbeat set in etcdserver + defaultServerTimeout = 5*time.Second + 10*(100*time.Millisecond) // time to wait for a Watch request - defaultWatchTimeout = 5 * time.Minute + defaultWatchTimeout = time.Duration(math.MaxInt64) ) var errClosed = errors.New("etcdhttp: client closed connection")