Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(mux): fix the problem that output unreasonable error when exit if enable mux and use Kitex Protobuf #922

Merged
merged 2 commits into from May 11, 2023
Merged

fix(mux): fix the problem that output unreasonable error when exit if enable mux and use Kitex Protobuf #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3d1492
fix(mux): fix the problem that output unreasonable error when exit if…
YangruiEmma May 4, 2023
3e56005
fix(mux): fix the problem that output unreasonable error when exit if…
YangruiEmma May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/remote/codec/default_codec.go
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@ func (c *defaultCodec) Encode(ctx context.Context, message remote.Message, out r
}
payloadLen = out.MallocLen() - headerLen
binary.BigEndian.PutUint32(framedLenField, uint32(payloadLen))
} else if message.ServiceInfo().PayloadCodec == serviceinfo.Protobuf {
} else if message.ProtocolInfo().CodecType == serviceinfo.Protobuf {
return perrors.NewProtocolErrorWithMsg("protobuf just support 'framed' trans proto")
}
// 5. fill totalLen field for header if needed
Expand Down
29 changes: 29 additions & 0 deletions pkg/remote/codec/default_codec_test.go
View file
Open in desktop
Expand Up @@ -212,6 +212,35 @@ func TestDefaultSizedCodec_Encode_Decode(t *testing.T) {
test.Assert(t, err == nil, err)
}

func TestCodecTypeNotMatchWithServiceInfoPayloadCodec(t *testing.T) {
var req interface{}
remote.PutPayloadCode(serviceinfo.Thrift, mpc)
remote.PutPayloadCode(serviceinfo.Protobuf, mpc)
ri := rpcinfo.NewRPCInfo(nil, nil, rpcinfo.NewInvocation("", ""), rpcinfo.NewRPCConfig(), rpcinfo.NewRPCStats())
codec := NewDefaultCodec()

// case 1: the payloadCodec of svcInfo is Protobuf, CodecType of message is Thrift
svcInfo := &serviceinfo.ServiceInfo{
PayloadCodec: serviceinfo.Protobuf,
}
msg := remote.NewMessage(req, svcInfo, ri, remote.Call, remote.Server)
msg.SetProtocolInfo(remote.ProtocolInfo{TransProto: transport.TTHeader, CodecType: serviceinfo.Thrift})
err := codec.Encode(context.Background(), msg, remote.NewWriterBuffer(256))
test.Assert(t, err == nil, err)

// case 2: the payloadCodec of svcInfo is Thrift, CodecType of message is Protobuf
svcInfo = &serviceinfo.ServiceInfo{
PayloadCodec: serviceinfo.Thrift,
}
msg = remote.NewMessage(req, svcInfo, ri, remote.Call, remote.Server)
msg.SetProtocolInfo(remote.ProtocolInfo{TransProto: transport.TTHeader, CodecType: serviceinfo.Protobuf})
err = codec.Encode(context.Background(), msg, remote.NewWriterBuffer(256))
test.Assert(t, err != nil)
msg.SetProtocolInfo(remote.ProtocolInfo{TransProto: transport.Framed, CodecType: serviceinfo.Protobuf})
err = codec.Encode(context.Background(), msg, remote.NewWriterBuffer(256))
test.Assert(t, err == nil)
}

var mpc remote.PayloadCodec = mockPayloadCodec{}

type mockPayloadCodec struct{}
Expand Down