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.

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

copr: avoid NPE when store is not available when balance batch cop task #28110

Merged
merged 2 commits into from
Sep 17, 2021

Conversation

windtalker
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #28096

Problem Summary:
As described in the issue.

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:
The root cause is in L162, it tries to get err.Error() even if err is nil

if err != nil || !resp.Resp.(*mpp.IsAliveResponse).Available {
logutil.BgLogger().Warn("Cannot detect store's availability", zap.String("store address", s.GetAddr()), zap.String("err message", err.Error()))
mu.Lock()
mppStoreLastFailTime[s.GetAddr()] = time.Now()
mu.Unlock()
return
}

The pr fix it by only get err.Error() if err is not nil.

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 a bug that TiDB may crash when TiFlash is shutting down.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 17, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fzhedu
  • hanfei1991

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-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 17, 2021
@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.2

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.1

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.0

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 17, 2021
Copy link
Contributor

@fzhedu fzhedu left a comment

Choose a reason for hiding this comment

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

/LGTM

@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 17, 2021
@fzhedu
Copy link
Contributor

fzhedu commented Sep 17, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 50174ec

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 17, 2021
@ti-chi-bot ti-chi-bot merged commit c6dfd70 into pingcap:master Sep 17, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #28138

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #28139

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #28140

zhouqiang-cl added a commit that referenced this pull request Sep 26, 2021
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: zhouqiang <[email protected]>
@windtalker windtalker deleted the panic_when_tiflash_down branch November 16, 2021 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Killing TiFlash causes TiDB down
5 participants