Skip to content

Commit 448a90f

Browse files
committed
chore: fix CI problem
1 parent 1fa17cf commit 448a90f

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/remote/trans/ttstream/cancel_stream_task_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func TestCancelStreamTaskConfig(t *testing.T) {
5555
ticker = nil
5656
}
5757

58+
// todo: optimized unit time-consuming
5859
func TestCancelStreamTask(t *testing.T) {
5960
cfd, sfd := netpoll.GetSysFdPairs()
6061
cconn, err := netpoll.NewFDConnection(cfd)
@@ -88,7 +89,7 @@ func TestCancelStreamTask(t *testing.T) {
8889
req := new(testRequest)
8990
req.A = 123
9091
if sErr := cs.SendMsg(cCtx, req); sErr != nil {
91-
//test.Assert(t, sErr == defaultCancelStreamTaskConfig.CancelException, sErr)
92+
// test.Assert(t, sErr == defaultCancelStreamTaskConfig.CancelException, sErr)
9293
wg.Done()
9394
break
9495
}
@@ -97,7 +98,7 @@ func TestCancelStreamTask(t *testing.T) {
9798

9899
for {
99100
if rErr := ss.RecvMsg(sCtx, new(testResponse)); rErr != nil {
100-
//test.Assert(t, errors.Is(rErr, newExceptionType(context.Canceled.Error(), nil, 12008)), rErr)
101+
// test.Assert(t, errors.Is(rErr, newExceptionType(context.Canceled.Error(), nil, 12008)), rErr)
101102
wg.Done()
102103
break
103104
}
@@ -112,7 +113,7 @@ func TestCancelStreamTask(t *testing.T) {
112113
test.Assert(t, err == nil, err)
113114

114115
cs = newClientStream(rawClientStream)
115-
ss = newServerStream(rawClientStream)
116+
ss = newServerStream(rawServerStream)
116117

117118
wg.Add(2)
118119
go func() {
@@ -144,7 +145,7 @@ func TestCancelStreamTask(t *testing.T) {
144145
test.Assert(t, err == nil, err)
145146

146147
cs = newClientStream(rawClientStream)
147-
ss = newServerStream(rawClientStream)
148+
ss = newServerStream(rawServerStream)
148149

149150
wg.Add(2)
150151
go func() {

pkg/remote/trans/ttstream/client_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (c clientProvider) NewStream(ctx context.Context, ri rpcinfo.RPCInfo) (stre
9090
if strHeader == nil {
9191
strHeader = map[string]string{}
9292
}
93-
// retrieve deadline fron context as the whole stream timeout
93+
// retrieve deadline from context as the whole stream timeout
9494
if ddl, ok := ctx.Deadline(); ok {
9595
tm := time.Until(ddl)
9696
intHeader[ttheader.RPCTimeout] = strconv.Itoa(int(tm.Milliseconds()))

pkg/remote/trans/ttstream/transport.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@ func isIgnoreError(err error) bool {
4747
return errors.Is(err, netpoll.ErrEOF) || errors.Is(err, io.EOF) || errors.Is(err, netpoll.ErrConnClosed)
4848
}
4949

50-
var (
51-
// ticker is used to manage closeStreamTask.
52-
ticker *utils.SharedTicker
53-
)
50+
// ticker is used to manage closeStreamTask.
51+
var ticker *utils.SharedTicker
5452

5553
// transport is used to read/write frames and disturbed frames to different streams
5654
type transport struct {
@@ -207,6 +205,7 @@ func (t *transport) readFrame(reader bufiox.Reader) error {
207205
var ok bool
208206
s, ok = t.loadStream(fr.sid)
209207
if !ok {
208+
// todo: think about remove this error log since this is a very common
210209
klog.Errorf("transport[%d] read a unknown stream: frame[%s]", t.kind, fr.String())
211210
// ignore unknown stream error
212211
err = nil

0 commit comments

Comments
 (0)