Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdhttp: reset serve and watch timeout

Browse Source
This commit is contained in:
Yicheng Qin 2015-01-02 10:56:01 -08:00
parent 7273a861a6
commit 4dd00be365
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdserver/etcdhttp/http.go
View File

@ -19,6 +19,7 @@ package etcdhttp
import ( import (
"errors" "errors"
"log" "log"
"math"
"net/http" "net/http"
"strings" "strings"
"time" "time"
@ -29,10 +30,13 @@ import (
const ( const (
// time to wait for response from EtcdServer requests // 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 // time to wait for a Watch request
defaultWatchTimeout = 5 * time.Minute defaultWatchTimeout = time.Duration(math.MaxInt64)
) )
var errClosed = errors.New("etcdhttp: client closed connection") var errClosed = errors.New("etcdhttp: client closed connection")