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

lightning: check counter value to make code more robust (#37380) #37398

Merged
merged 3 commits into from
Sep 8, 2022
Merged

lightning: check counter value to make code more robust (#37380) #37398

merged 3 commits into from
Sep 8, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 26, 2022 •
edited
Loading

cherry-pick #37380 to release-6.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/37398

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

git push git@github.com:ti-srebot/tidb.git pr/37398:release-6.1-b99aebee3110

What problem does this PR solve?

Issue Number: ref #37338

Problem Summary:

What is changed and how it works?

cannot reproduce this case in local env, so add this check to make code more robust, instead of panic

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@D3Hunter @ti-srebot
cherry pick pingcap#37380 to release-6.1
7b7cdfe 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 26, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • buchuitoudegou
  • lance6716

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.

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

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 26, 2022
@ti-srebot ti-srebot mentioned this pull request Aug 26, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 26, 2022
@ti-srebot ti-srebot added component/lightning This issue is related to Lightning of TiDB. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.1-cherry-pick labels Aug 26, 2022
@ti-srebot ti-srebot added this to the v6.1.1 milestone Aug 26, 2022
@ti-srebot
Copy link
Contributor Author

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

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 7, 2022
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 7, 2022
@D3Hunter
Copy link
Contributor

D3Hunter commented Sep 7, 2022

/run-integration-br-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 7, 2022
@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 Sep 7, 2022
@D3Hunter
Copy link
Contributor

D3Hunter commented Sep 8, 2022

ci success https://ci.pingcap.net/blue/organizations/jenkins/br_ghpr_unit_and_integration_test/detail/br_ghpr_unit_and_integration_test/13188/pipeline

@D3Hunter
Copy link
Contributor

D3Hunter commented Sep 8, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 89f4798

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 8, 2022
@ti-chi-bot ti-chi-bot merged commit ec2e605 into pingcap:release-6.1 Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@buchuitoudegou buchuitoudegou buchuitoudegou approved these changes

@lance6716 lance6716 lance6716 approved these changes

@sleepymole sleepymole Awaiting requested review from sleepymole

@Rustin170506 Rustin170506 Awaiting requested review from Rustin170506

Assignees

@D3Hunter D3Hunter

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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/6.1-cherry-pick
Projects
None yet
Milestone
v6.1.1
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @D3Hunter @lance6716 @buchuitoudegou @VelocityLight