From 7eb3e5ec56ff14987cc501152a51dfb2cb215bf1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 7 Jan 2020 09:45:21 +0100 Subject: [PATCH] vendor: bump google.golang.org/grpc v1.23.1 full diff: https://github.com/grpc/grpc-go/compare/v1.23.0...v1.23.1 - grpc/grpc-go#3018 server: set and advertise max frame size of 16KB - grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache - Before the fix, if the timer to remove a SubConn fires at the same time NewSubConn cancels the timer, it caused a mutex leak and deadlock. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 013151ff786b0391ecbf5a6b0fbe68d3d0b0ded1 Component: cli --- components/cli/vendor.conf | 2 +- .../grpc/internal/transport/http2_server.go | 5 ++++- .../google.golang.org/grpc/internal/transport/http_util.go | 1 + components/cli/vendor/google.golang.org/grpc/version.go | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf index dec5b99fe18..263ee1199e8 100755 --- a/components/cli/vendor.conf +++ b/components/cli/vendor.conf @@ -79,7 +79,7 @@ golang.org/x/sys 6d18c012aee9febd81bbf9806760 golang.org/x/text f21a4dfb5e38f5895301dc265a8def02365cc3d0 # v0.3.0 golang.org/x/time fbb02b2291d28baffd63558aa44b4b56f178d650 google.golang.org/genproto 02b4e95473316948020af0b7a4f0f22c73929b0e -google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0 +google.golang.org/grpc 39e8a7b072a67ca2a75f57fa2e0d50995f5b22f6 # v1.23.1 gopkg.in/inf.v0 d2d2541c53f18d2a059457998ce2876cc8e67cbf # v0.9.1 gopkg.in/yaml.v2 bb4e33bf68bf89cad44d386192cbed201f35b241 # v2.2.3 gotest.tools 1083505acf35a0bd8a696b26837e1fb3187a7a83 # v2.3.0 diff --git a/components/cli/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/components/cli/vendor/google.golang.org/grpc/internal/transport/http2_server.go index 83439b5627d..4e26f6a1d6b 100644 --- a/components/cli/vendor/google.golang.org/grpc/internal/transport/http2_server.go +++ b/components/cli/vendor/google.golang.org/grpc/internal/transport/http2_server.go @@ -138,7 +138,10 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err } framer := newFramer(conn, writeBufSize, readBufSize, maxHeaderListSize) // Send initial settings as connection preface to client. - var isettings []http2.Setting + isettings := []http2.Setting{{ + ID: http2.SettingMaxFrameSize, + Val: http2MaxFrameLen, + }} // TODO(zhaoq): Have a better way to signal "no limit" because 0 is // permitted in the HTTP2 spec. maxStreams := config.MaxStreams diff --git a/components/cli/vendor/google.golang.org/grpc/internal/transport/http_util.go b/components/cli/vendor/google.golang.org/grpc/internal/transport/http_util.go index 9d212867ce2..8f5f3349d90 100644 --- a/components/cli/vendor/google.golang.org/grpc/internal/transport/http_util.go +++ b/components/cli/vendor/google.golang.org/grpc/internal/transport/http_util.go @@ -667,6 +667,7 @@ func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, maxHeaderList writer: w, fr: http2.NewFramer(w, r), } + f.fr.SetMaxReadFrameSize(http2MaxFrameLen) // Opt-in to Frame reuse API on framer to reduce garbage. // Frames aren't safe to read from after a subsequent call to ReadFrame. f.fr.SetReuseFrames() diff --git a/components/cli/vendor/google.golang.org/grpc/version.go b/components/cli/vendor/google.golang.org/grpc/version.go index 5411a73a22e..58885056385 100644 --- a/components/cli/vendor/google.golang.org/grpc/version.go +++ b/components/cli/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.23.0" +const Version = "1.23.1"