embed: gracefully shut down gRPC server
Fix https://github.com/coreos/etcd/issues/7322. Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>release-3.2
parent
ea5f6dab6b
commit
c407e097e2
|
@ -148,6 +148,14 @@ func (e *Etcd) Config() Config {
|
||||||
func (e *Etcd) Close() {
|
func (e *Etcd) Close() {
|
||||||
e.closeOnce.Do(func() { close(e.stopc) })
|
e.closeOnce.Do(func() { close(e.stopc) })
|
||||||
|
|
||||||
|
// (gRPC server) stops accepting new connections,
|
||||||
|
// RPCs, and blocks until all pending RPCs are finished
|
||||||
|
for _, sctx := range e.sctxs {
|
||||||
|
for gs := range sctx.grpcServerC {
|
||||||
|
gs.GracefulStop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for _, sctx := range e.sctxs {
|
for _, sctx := range e.sctxs {
|
||||||
sctx.cancel()
|
sctx.cancel()
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,11 +52,14 @@ type serveCtx struct {
|
||||||
|
|
||||||
userHandlers map[string]http.Handler
|
userHandlers map[string]http.Handler
|
||||||
serviceRegister func(*grpc.Server)
|
serviceRegister func(*grpc.Server)
|
||||||
|
grpcServerC chan *grpc.Server
|
||||||
}
|
}
|
||||||
|
|
||||||
func newServeCtx() *serveCtx {
|
func newServeCtx() *serveCtx {
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
return &serveCtx{ctx: ctx, cancel: cancel, userHandlers: make(map[string]http.Handler)}
|
return &serveCtx{ctx: ctx, cancel: cancel, userHandlers: make(map[string]http.Handler),
|
||||||
|
grpcServerC: make(chan *grpc.Server, 2), // in case sctx.insecure,sctx.secure true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// serve accepts incoming connections on the listener l,
|
// serve accepts incoming connections on the listener l,
|
||||||
|
@ -72,8 +75,11 @@ 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
|
||||||
v3electionpb.RegisterElectionServer(gs, servElection)
|
v3electionpb.RegisterElectionServer(gs, servElection)
|
||||||
v3lockpb.RegisterLockServer(gs, servLock)
|
v3lockpb.RegisterLockServer(gs, servLock)
|
||||||
if sctx.serviceRegister != nil {
|
if sctx.serviceRegister != nil {
|
||||||
|
@ -103,6 +109,7 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlscfg *tls.Config, handle
|
||||||
|
|
||||||
if sctx.secure {
|
if sctx.secure {
|
||||||
gs := v3rpc.Server(s, tlscfg)
|
gs := v3rpc.Server(s, tlscfg)
|
||||||
|
sctx.grpcServerC <- gs
|
||||||
v3electionpb.RegisterElectionServer(gs, servElection)
|
v3electionpb.RegisterElectionServer(gs, servElection)
|
||||||
v3lockpb.RegisterLockServer(gs, servLock)
|
v3lockpb.RegisterLockServer(gs, servLock)
|
||||||
if sctx.serviceRegister != nil {
|
if sctx.serviceRegister != nil {
|
||||||
|
|
Loading…
Reference in New Issue