fix attach api ctx error for unknown requests like StoreSafeTS (#720)

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
tikv · Feb 28, 2023 · 11d34cb · 11d34cb
1 parent 596b794
commit 11d34cb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/apicodec/codec.go b/internal/apicodec/codec.go
@@ -101,10 +101,7 @@ func attachAPICtx(c Codec, req *tikvrpc.Request) (*tikvrpc.Request, error) {
 		r.Req = &mpp
 	}
 
-	err := tikvrpc.AttachContext(&r, ctx)
-	if err != nil {
-		return nil, err
-	}
+	_ = tikvrpc.AttachContext(&r, ctx)
 
 	return &r, nil
 }
diff --git a/internal/apicodec/codec_test.go b/internal/apicodec/codec_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/stretchr/testify/assert"
+	"github.com/tikv/client-go/v2/tikvrpc"
 )
 
 func TestParseKeyspaceID(t *testing.T) {
@@ -46,3 +47,13 @@ func TestDecodeKey(t *testing.T) {
 	assert.Empty(t, pfx)
 	assert.Empty(t, key)
 }
+
+func TestEncodeUnknownRequest(t *testing.T) {
+	req := &tikvrpc.Request{
+		Type: tikvrpc.CmdStoreSafeTS,
+		Req:  &kvrpcpb.StoreSafeTSRequest{},
+	}
+	c := NewCodecV1(ModeTxn)
+	_, err := c.EncodeRequest(req)
+	assert.Nil(t, err)
+}