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: fixed panic when DoChecksum returned error (#27596) #27686

Merged
merged 3 commits into from
Oct 13, 2021
Merged

lightning: fixed panic when DoChecksum returned error (#27596) #27686

merged 3 commits into from
Oct 13, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 30, 2021 •
edited
Loading

cherry-pick #27596 to release-5.2
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/27686

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

git push [email protected]:ti-srebot/tidb.git pr/27686:release-5.2-69257ebda503

What problem does this PR solve?

Problem Summary:

When remote checksum failed, Lightning panicked instead of gracefully failing.

What is changed and how it works?

What's Changed:

Add back the missing error check

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 

Fixed Lightning panic when it failed to perform checksum on target cluster.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 30, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • glorv
  • gozssky

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 Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 30, 2021
@ti-srebot ti-srebot mentioned this pull request Aug 30, 2021
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 30, 2021
@ti-srebot ti-srebot added component/lightning This issue is related to Lightning of TiDB. sig/migrate size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Aug 30, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 31, 2021
@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 1, 2021
@Little-Wallace
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e192e29

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 3, 2021
tennix
tennix reviewed Sep 9, 2021
View reviewed changes
br/pkg/lightning/restore/table_restore.go
@@ -722,6 +722,9 @@ func (tr *TableRestore) postProcess(
}

remoteChecksum, err := DoChecksum(ctx, tr.tableInfo)
if err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Can we have https://github.com/kisielk/errcheck linter enabled for this kind of bug?

Copy link
Member

Choose a reason for hiding this comment

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

Seems the errcheck linter could not check this kind of bug.

@glorv
Copy link
Contributor

glorv commented Sep 28, 2021

@zhouqiang-cl Can we merge this PR?

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 13, 2021
@ti-chi-bot ti-chi-bot merged commit 5302a51 into pingcap:release-5.2 Oct 13, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.2.2 milestone Oct 20, 2021
@zimulala zimulala mentioned this pull request Oct 25, 2021
Merged
13 tasks
@kennytm kennytm deleted the release-5.2-69257ebda503 branch November 24, 2021 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tennix tennix tennix left review comments

@sleepymole sleepymole sleepymole approved these changes

@glorv glorv glorv approved these changes

@jackysp jackysp Awaiting requested review from jackysp

Assignees

@kennytm kennytm

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/migrate 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/bugfix This PR fixes a bug. type/5.2-cherry-pick
Projects
None yet
Milestone
v5.2.2
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @Little-Wallace @glorv @tennix @sleepymole @kennytm @zhouqiang-cl