Skip to content

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

Merged
ti-chi-bot merged 9 commits into
pingcap:release-5.1from
ti-srebot:release-5.1-d04a1285a54c
Feb 9, 2022
Merged

ddl, util/codec: fix add index OOM and prevent panic in logging (#29925)#30123
ti-chi-bot merged 9 commits into
pingcap:release-5.1from
ti-srebot:release-5.1-d04a1285a54c

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Nov 24, 2021

cherry-pick #29925 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/30123

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/30123:release-5.1-d04a1285a54c

What problem does this PR solve?

Issue Number: close #27687

Reproducible step:

drop table if exists t;
create table t (a bigint primary key);
insert into t values (-9078130948872077313);
alter table t add index idx(a);

Problem Summary:

This problem may occur in the following conditions:

  • The table contains an clustered integer primary key.
    • If it is unsigned, at least one large primary key(> MaxInt64) is explicitly inserted.
    • If it is signed, at least one small negative number is explicitly inserted.
  • An adding index job is running.

There is a bug in the current implementation of NewCommonHandle():

tidb/kv/key.go

Lines 237 to 262 in 37bfd57

// NewCommonHandle creates a CommonHandle from a encoded bytes which is encoded by code.EncodeKey.
func NewCommonHandle(encoded []byte) (*CommonHandle, error) {
ch := &CommonHandle{encoded: encoded}
if len(encoded) < 9 {
padded := make([]byte, 9)
copy(padded, encoded)
ch.encoded = padded
}
remain := encoded
endOff := uint16(0)
for len(remain) > 0 {
if remain[0] == 0 {
// padded data
break
}
var err error
var col []byte
col, remain, err = codec.CutOne(remain)
if err != nil {
return nil, err
}
endOff += uint16(len(col))
ch.colEndOffsets = append(ch.colEndOffsets, endOff)
}
return ch, nil
}

If the argument bytes have a prefix like 0x8203, CutOne() cuts nothing so that the remain is unchanged in the loop. This dead loop may cause TiDB OOM quickly because it endlessly append() colEndOffsets.

What is changed and how it works?

  1. The function peek() in the decoding process does not handle the invalid key. It is possible to run into a dead loop and makes TiDB OOM.
  2. The function tryDecodeHandleToString() is only used for logging, it should be wrapped with recover() so that the critical operation is not interrupted.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix an issue that adding index panics by chance.

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Nov 24, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • wjhuang2016

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Nov 24, 2021
@ti-srebot ti-srebot added affects-5.0 This bug affects 5.0.x versions. affects-5.1 This bug affects 5.1.x versions. affects-5.2 This bug affects 5.2.x versions. affects-5.3 This bug affects 5.3.x versions. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 24, 2021
@ti-chi-bot ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Nov 24, 2021
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 24, 2021
@ti-chi-bot ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Nov 24, 2021
@ti-srebot
Copy link
Copy Markdown
Contributor Author

@tangenta you're already a collaborator in bot's repo.

@ti-chi-bot
Copy link
Copy Markdown
Member

@hawkingrei: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 24, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 7, 2022
@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 7, 2022

/run-check_dev

@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 7, 2022

/run-mysql-test

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@bb7133 bb7133 force-pushed the release-5.1-d04a1285a54c branch from 7a51ee6 to e074b6b Compare February 7, 2022 04:12
@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 8, 2022

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

@bb7133: /merge in this pull request requires 2 approval(s).

Details

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 8, 2022
@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 8, 2022

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 618d3de

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 8, 2022
@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 9, 2022

/run-check_dev

@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 9, 2022

/merge

@bb7133
Copy link
Copy Markdown
Member

bb7133 commented Feb 9, 2022

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 2e28e12 into pingcap:release-5.1 Feb 9, 2022
@zhouqiang-cl zhouqiang-cl added this to the v5.1.4 milestone Feb 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

affects-5.0 This bug affects 5.0.x versions. affects-5.1 This bug affects 5.1.x versions. affects-5.2 This bug affects 5.2.x versions. affects-5.3 This bug affects 5.3.x versions. cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.1-cherry-pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants