upgrade grpc to v1.73 #1779
+111
−23
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ import ( | |
| "google.golang.org/grpc/encoding/gzip" | ||
| "google.golang.org/grpc/experimental" | ||
| "google.golang.org/grpc/keepalive" | ||
| "google.golang.org/grpc/mem" | ||
| ) | ||
|
|
||
| type connPool struct { | ||
|
|
@@ -76,6 +77,7 @@ func (a *connPool) monitoredDial(ctx context.Context, connName, target string, o | |
| conn = &monitoredConn{ | ||
| Name: connName, | ||
| } | ||
| //nolint:SA1019 | ||
| conn.ClientConn, err = grpc.DialContext(ctx, target, opts...) | ||
|
Author
There was a problem hiding this comment. Keep using the old (deprecated) API to avoid potential TiFlash problems. |
||
| if err != nil { | ||
| return nil, err | ||
|
|
@@ -120,6 +122,9 @@ func (a *connPool) Init(addr string, security config.Security, idleNotify *uint3 | |
| callOptions = append(callOptions, grpc.UseCompressor(gzip.Name)) | ||
| } | ||
|
|
||
| // Don't remove this until we no longer use sharedBytes in tipb and kvproto. | ||
| callOptions = append(callOptions, grpc.ForceCodec(&legacyCodec{})) | ||
|
|
||
| opts = append([]grpc.DialOption{ | ||
| opt, | ||
| grpc.WithInitialWindowSize(cfg.TiKVClient.GrpcInitialWindowSize), | ||
|
|
@@ -141,8 +146,8 @@ func (a *connPool) Init(addr string, security config.Security, idleNotify *uint3 | |
| Timeout: cfg.TiKVClient.GetGrpcKeepAliveTimeout(), | ||
| }), | ||
| }, opts...) | ||
| if !cfg.TiKVClient.GrpcSharedBufferPool { | ||
|
Author
There was a problem hiding this comment. After grpc-go 1.66, the default pool was changed from noop pool to |
||
| opts = append(opts, experimental.WithBufferPool(mem.NopBufferPool{})) | ||
| } | ||
| conn, err := a.monitoredDial( | ||
| ctx, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright 2026 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package client | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "google.golang.org/protobuf/proto" | ||
| "google.golang.org/protobuf/protoadapt" | ||
| ) | ||
|
|
||
| // legacyCodec copies the legacy proto Codec used in grpc-go < 1.66, see | ||
| // https://github.com/grpc/grpc-go/blob/v1.65.x/encoding/proto/proto.go | ||
| // tipb/kvproto rely on grpc-go passing a []byte into `Unmarshal` that can be | ||
| // owned by the callee, so we override the `Marshal` to reduce the copy overhead. | ||
| // But after grpc-go >= 1.66, it switches to CodecV2. And the buffer passed into | ||
| // `Unmarshal` is now from a shared pool, which will be returned to the pool right | ||
| // after `Unmarshal` returns, which breaks the assumption of tipb/kvproto. So we | ||
| // force the old Codec behavior until sharedBytes is gone. | ||
| type legacyCodec struct{} | ||
|
|
||
| func (legacyCodec) Marshal(v any) ([]byte, error) { | ||
| vv := messageV2Of(v) | ||
| if vv == nil { | ||
| return nil, fmt.Errorf("failed to marshal, message is %T, want proto.Message", v) | ||
| } | ||
|
|
||
| return proto.Marshal(vv) | ||
| } | ||
|
|
||
| func (legacyCodec) Unmarshal(data []byte, v any) error { | ||
| vv := messageV2Of(v) | ||
| if vv == nil { | ||
| return fmt.Errorf("failed to unmarshal, message is %T, want proto.Message", v) | ||
| } | ||
|
|
||
| return proto.Unmarshal(data, vv) | ||
| } | ||
|
|
||
| func messageV2Of(v any) proto.Message { | ||
| switch v := v.(type) { | ||
| case protoadapt.MessageV1: | ||
| return protoadapt.MessageV2Of(v) | ||
| case protoadapt.MessageV2: | ||
| return v | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (legacyCodec) Name() string { | ||
| return "proto" | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about other go.mod in examples?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's OK to keep them, but we can upgrade them as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think keep same is better