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

embed: signal 'grpcServerC' before cmux serve

Browse Source 
CMux.Serve blocks, so grpcServerC was never closed.

Fix https://github.com/coreos/etcdlabs/issues/216.

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-04-18 17:46:51 -07:00
parent 8fa4b8da6e
commit ba299bcaaf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embed/serve.go
View File

@ -74,8 +74,6 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlscfg *tls.Config, handle
servElection := v3election.NewElectionServer(v3c) servElection := v3election.NewElectionServer(v3c)
servLock := v3lock.NewLockServer(v3c) servLock := v3lock.NewLockServer(v3c)
defer close(sctx.grpcServerC)
if sctx.insecure { if sctx.insecure {
gs := v3rpc.Server(s, nil) gs := v3rpc.Server(s, nil)
sctx.grpcServerC <- gs sctx.grpcServerC <- gs
@ -140,6 +138,7 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlscfg *tls.Config, handle
plog.Infof("serving client requests on %s", sctx.l.Addr().String()) plog.Infof("serving client requests on %s", sctx.l.Addr().String())
} }
close(sctx.grpcServerC)
return m.Serve() return m.Serve()
} }