vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcd: add a read/write timeout to server 

The default is for connections to last forever[1]. This leads to fds
leaking. I set the timeout so high by default so that watches don't have
to keep retrying but perhaps we should set it slower.

Tested on a cluster with lots of clients and it seems to have relieved
the problem.

[1] https://groups.google.com/forum/#!msg/golang-nuts/JFhGwh1q9xU/heh4J8pul3QJ

Original Commit: 084dcb5596
From: philips <brandon@ifup.org>
release-2.0
Yicheng Qin 2014-08-03 14:21:19 -07:00
parent e587402c26
commit 4f10917ce9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main.go
View File

@ -7,6 +7,7 @@ import (
"net"
"net/http"
"os"
"time"
"github.com/coreos/etcd/config"
"github.com/coreos/etcd/etcd"
@ -26,7 +27,10 @@ func main() {
os.Exit(0)
}
e := etcd.New(config)
e, err := etcd.New(config)
if err != nil {
log.Fatal("etcd:", err)
}
go e.Run()
corsInfo, err := ehttp.NewCORSInfo(config.CorsOrigins)
@ -34,13 +38,15 @@ func main() {
log.Fatal("cors:", err)
}
readTimeout := time.Duration(config.HTTPReadTimeout) * time.Second
writeTimeout := time.Duration(config.HTTPWriteTimeout) * time.Second
go func() {
serve("raft", config.Peer.BindAddr, config.PeerTLSInfo(), corsInfo, e.RaftHandler())
serve("raft", config.Peer.BindAddr, config.PeerTLSInfo(), corsInfo, e.RaftHandler(), readTimeout, writeTimeout)
}()
serve("etcd", config.BindAddr, config.EtcdTLSInfo(), corsInfo, e)
serve("etcd", config.BindAddr, config.EtcdTLSInfo(), corsInfo, e, readTimeout, writeTimeout)
}
func serve(who string, addr string, tinfo *config.TLSInfo, cinfo *ehttp.CORSInfo, handler http.Handler) {
func serve(who string, addr string, tinfo *config.TLSInfo, cinfo *ehttp.CORSInfo, handler http.Handler, readTimeout, writeTimeout time.Duration) {
t, terr := tinfo.ServerConfig()
l, err := net.Listen("tcp", addr)
if err != nil {
@ -63,5 +69,6 @@ func serve(who string, addr string, tinfo *config.TLSInfo, cinfo *ehttp.CORSInfo
}
h := &ehttp.CORSHandler{handler, cinfo}
log.Fatal(http.Serve(l, h))
s := &http.Server{Handler: h, ReadTimeout: readTimeout, WriteTimeout: writeTimeout}
log.Fatal(s.Serve(l))
}