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

optimize(mux): wrap ErrReadTimeout with ErrRPCTimeout in mux scenario #466

Merged
merged 1 commit into from May 25, 2022
Merged

optimize(mux): wrap ErrReadTimeout with ErrRPCTimeout in mux scenario #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/trans/default_client_handler.go
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ func (t *cliTransHandler) Read(ctx context.Context, conn net.Conn, recvMsg remot
err = t.codec.Decode(ctx, recvMsg, bufReader)
if err != nil {
if t.ext.IsTimeoutErr(err) {
return kerrors.ErrRPCTimeout.WithCause(err)
err = kerrors.ErrRPCTimeout.WithCause(err)
}
return err
}
Expand Down
6 changes: 5 additions & 1 deletion pkg/remote/trans/netpollmux/client_handler.go
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ package netpollmux

import (
"context"
"errors"
"fmt"
"net"
"sync/atomic"
Expand Down Expand Up @@ -115,7 +116,7 @@ func (t *cliTransHandler) Write(ctx context.Context, conn net.Conn, sendMsg remo
}

// Read implements the remote.ClientTransHandler interface.
func (t *cliTransHandler) Read(ctx context.Context, conn net.Conn, msg remote.Message) (err error) {
func (t *cliTransHandler) Read(ctx context.Context, conn net.Conn, msg remote.Message) error {
ri := msg.RPCInfo()
mc, _ := conn.(*muxCliConn)
seqID := ri.Invocation().SeqID()
Expand Down Expand Up @@ -144,6 +145,9 @@ func (t *cliTransHandler) Read(ctx context.Context, conn net.Conn, msg remote.Me
stats2.Record(ctx, ri, stats.ReadStart, nil)
msg.SetPayloadCodec(t.opt.PayloadCodec)
err = t.codec.Decode(ctx, msg, callback.bufReader)
if err != nil && errors.Is(err, netpoll.ErrReadTimeout) {
err = kerrors.ErrRPCTimeout.WithCause(err)
}
stats2.Record(ctx, ri, stats.ReadFinish, err)
return err
}
Expand Down