*: match with writers for gRPC traffic

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
etcd-io · Aug 5, 2019 · bdeab15 · bdeab15
1 parent 98bbd56
commit bdeab15
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/embed/etcd.go b/embed/etcd.go
@@ -363,7 +363,7 @@ func (e *Etcd) servePeers() (err error) {
 	for _, p := range e.Peers {
 		gs := v3rpc.Server(e.Server, peerTLScfg)
 		m := cmux.New(p.Listener)
-		go gs.Serve(m.Match(cmux.HTTP2()))
+		go gs.Serve(m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc")))
 		srv := &http.Server{
 			Handler:     grpcHandlerFunc(gs, ph),
 			ReadTimeout: 5 * time.Minute,

diff --git a/embed/serve.go b/embed/serve.go
@@ -102,7 +102,7 @@ func (sctx *serveCtx) serve(
 		if sctx.serviceRegister != nil {
 			sctx.serviceRegister(gs)
 		}
-		grpcl := m.Match(cmux.HTTP2())
+		grpcl := m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))
 		go func() { errHandler(gs.Serve(grpcl)) }()
 
 		var gwmux *gw.ServeMux

diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go
@@ -174,7 +174,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) {
 	}
 	m := mustListenCMux(tlsinfo)
 
-	grpcl := m.Match(cmux.HTTP2())
+	grpcl := m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))
 	defer func() {
 		grpcl.Close()
 		plog.Infof("stopping listening for grpc-proxy client requests on %s", grpcProxyListenAddr)

diff --git a/integration/cluster.go b/integration/cluster.go
@@ -748,7 +748,7 @@ func (m *member) Launch() error {
 		cm.SetReadTimeout(time.Second)
 
 		if m.grpcServer != nil {
-			grpcl := cm.Match(cmux.HTTP2())
+			grpcl := cm.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))
 			go m.grpcServerPeer.Serve(grpcl)
 		}