From f5c71ad80fc08f620080d0a66e30c4fb5a7c13ac Mon Sep 17 00:00:00 2001 From: ahrtr Date: Tue, 28 Dec 2021 16:54:14 +0800 Subject: [PATCH] updated servePeers to remvoe the grpc server --- server/embed/etcd.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/server/embed/etcd.go b/server/embed/etcd.go index a3ba75a56f8e..7698a8b1a88e 100644 --- a/server/embed/etcd.go +++ b/server/embed/etcd.go @@ -16,7 +16,6 @@ package embed import ( "context" - "crypto/tls" "fmt" "io" defaultLog "log" @@ -41,7 +40,6 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/v2http" "go.etcd.io/etcd/server/v3/etcdserver/api/v2v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" - "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" "go.etcd.io/etcd/server/v3/storage" "go.etcd.io/etcd/server/v3/verify" @@ -533,20 +531,12 @@ func configurePeerListeners(cfg *Config) (peers []*peerListener, err error) { // configure peer handlers after rafthttp.Transport started func (e *Etcd) servePeers() (err error) { ph := etcdhttp.NewPeerHandler(e.GetLogger(), e.Server) - var peerTLScfg *tls.Config - if !e.cfg.PeerTLSInfo.Empty() { - if peerTLScfg, err = e.cfg.PeerTLSInfo.ServerConfig(); err != nil { - return err - } - } for _, p := range e.Peers { u := p.Listener.Addr().String() - gs := v3rpc.Server(e.Server, peerTLScfg, nil) m := cmux.New(p.Listener) - go gs.Serve(m.Match(cmux.HTTP2())) srv := &http.Server{ - Handler: grpcHandlerFunc(gs, ph), + Handler: ph, ReadTimeout: 5 * time.Minute, ErrorLog: defaultLog.New(io.Discard, "", 0), // do not log user error } @@ -566,7 +556,7 @@ func (e *Etcd) servePeers() (err error) { "stopping serving peer traffic", zap.String("address", u), ) - stopServers(ctx, &servers{secure: peerTLScfg != nil, grpc: gs, http: srv}) + srv.Shutdown(ctx) e.cfg.logger.Info( "stopped serving peer traffic", zap.String("address", u),