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

ddl, util/codec: fix add index OOM and prevent panic in logging #29925

Merged
merged 6 commits into from
Nov 24, 2021
Merged

ddl, util/codec: fix add index OOM and prevent panic in logging #29925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51f199c
ddl, util/codec: prevent panic in logging
tangenta Nov 18, 2021
9cbf918
check recover result
tangenta Nov 19, 2021
79396e4
address comment
tangenta Nov 19, 2021
f998c6e
add test for DecodeRowKey
tangenta Nov 19, 2021
c024760
Merge branch 'master' into fix-decode-panic
ti-chi-bot Nov 23, 2021
b181b6f
Merge branch 'master' into fix-decode-panic
ti-chi-bot Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ddl/backfilling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,13 @@ func (w *worker) handleReorgTasks(reorgInfo *reorgInfo, totalAddedCount *int64,
}

func tryDecodeToHandleString(key kv.Key) string {
defer func() {
if r := recover(); r != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use tidbutil.Recover instead of this code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But there is no way to print the value of key.

If we use tidbutil.Recover() and pass a function as the argument, there is no difference from the current implementation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

logutil.BgLogger().Warn("tryDecodeToHandleString panic",
zap.Any("recover()", r),
zap.Binary("key", key))
}
}()
handle, err := tablecodec.DecodeRowKey(key)
if err != nil {
recordPrefixIdx := bytes.Index(key, []byte("_r"))
Expand Down
14 changes: 14 additions & 0 deletions tablecodec/tablecodec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@ func TestTableCodec(t *testing.T) {
require.Equal(t, int64(2), h.IntValue())
}

// https://github.com/pingcap/tidb/issues/27687.
func TestTableCodecInvalid(t *testing.T) {
tableID := int64(100)
buf := make([]byte, 0, 11)
buf = append(buf, 't')
buf = codec.EncodeInt(buf, tableID)
buf = append(buf, '_', 'r')
buf = codec.EncodeInt(buf, -9078412423848787968)
buf = append(buf, '0')
_, err := DecodeRowKey(buf)
require.NotNil(t, err)
require.Equal(t, "invalid encoded key", err.Error())
}

// column is a structure used for test
type column struct {
id int64
Expand Down
2 changes: 1 addition & 1 deletion util/codec/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ func peek(b []byte) (length int, err error) {
return 0, errors.Trace(err)
}
length += l
if length < 0 {
if length <= 0 {
return 0, errors.New("invalid encoded key")
} else if length > originLength {
return 0, errors.Errorf("invalid encoded key, "+
Expand Down