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

copr: Fix bug that mpp node availability detect does not work in some corner cases #28201

Merged
merged 2 commits into from
Sep 23, 2021
Merged

copr: Fix bug that mpp node availability detect does not work in some corner cases #28201

merged 2 commits into from
Sep 23, 2021

Conversation

windtalker
Copy link
Contributor

@windtalker windtalker commented Sep 18, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close pingcap/tiflash#3118

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 we detect the TiFlash node's availability in balanceBatchCopTask, but here is a shortcut in balanceBatchCopTask that if there is only one batchCopTask, it will return directly without balancing, which means the availability check is also skipped.

tidb/store/copr/batch_coprocessor.go

Lines 107 to 111 in 3c9c01e

func balanceBatchCopTask(ctx context.Context, kvStore *kvStore, originalTasks []*batchCopTask, mppStoreLastFailTime map[string]time.Time, ttl time.Duration) []*batchCopTask {
if len(originalTasks) <= 1 {
return originalTasks
}
isMPP := mppStoreLastFailTime != nil

This pr fix this by not trigger the shortcut if the query is mpp query.

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 bug that mpp node availability detect does not work in some corner cases

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 18, 2021 •
edited
Loading

[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 do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 18, 2021
@windtalker windtalker force-pushed the mpp_node_detect_not_work branch from 8a5e187 to 1d12238 Compare September 18, 2021 09:56
@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.0

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.1

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.2

@sre-bot
Copy link
Contributor

sre-bot commented Sep 18, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@windtalker windtalker changed the title Fix bug that mpp node availability detect does not work in some corner cases copr: Fix bug that mpp node availability detect does not work in some corner cases Sep 18, 2021
@windtalker windtalker force-pushed the mpp_node_detect_not_work branch from 1d12238 to c1b6b2d Compare September 22, 2021 01:17
@zhouqiang-cl zhouqiang-cl 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 Sep 22, 2021
@ti-chi-bot ti-chi-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 22, 2021
fzhedu
fzhedu approved these changes Sep 22, 2021
View reviewed changes
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 the status/LGT1 Indicates that a PR has LGTM 1. label Sep 22, 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 23, 2021
@hanfei1991
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c1b6b2d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 23, 2021
@ti-chi-bot ti-chi-bot merged commit 624f7ca into pingcap:master Sep 23, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 23, 2021
@windtalker @ti-srebot
cherry pick pingcap#28201 to release-5.0
6542593 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 23, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #28287

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 23, 2021
@windtalker @ti-srebot
cherry pick pingcap#28201 to release-5.1
f1962c4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 23, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #28288

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 23, 2021
@windtalker @ti-srebot
cherry pick pingcap#28201 to release-5.2
a422efe 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 23, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #28289

windtalker added a commit to ti-srebot/tidb that referenced this pull request Sep 23, 2021
@windtalker
Revert "cherry pick pingcap#28201 to release-5.0"
6815029 
This reverts commit 6542593.
windtalker added a commit to ti-srebot/tidb that referenced this pull request Sep 23, 2021
@windtalker
cherry pick pingcap#28201
c2b1540
zhouqiang-cl pushed a commit that referenced this pull request Sep 26, 2021
@windtalker
copr: cherry pick #28201 to release-5.0-20210923 (#28341)
b917170 
* ddl, executor: fix test race in terror (#25405) (#28198)

* cherry pick #28201 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
windtalker added a commit to windtalker/tidb that referenced this pull request Oct 12, 2021
@windtalker
copr: Fix bug that mpp node availability detect does not work in some…
66aa22a 
… corner cases (pingcap#28201)
@windtalker windtalker mentioned this pull request Oct 12, 2021
Closed
12 tasks
ti-chi-bot pushed a commit that referenced this pull request Oct 13, 2021
@ti-srebot
copr: Fix bug that mpp node availability detect does not work in some…
5f8ffd3 
… corner cases (#28201) (#28289)
@windtalker windtalker deleted the mpp_node_detect_not_work branch November 16, 2021 01:24
ti-chi-bot pushed a commit that referenced this pull request Dec 17, 2021
@ti-srebot
copr: Fix bug that mpp node availability detect does not work in some…
fd41a45 
… corner cases (#28201) (#28287)
ti-chi-bot pushed a commit that referenced this pull request Feb 10, 2022
@ti-srebot
copr: Fix bug that mpp node availability detect does not work in some…
fc4f280 
… corner cases (#28201) (#28288)

close pingcap/tiflash#3118
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanfei1991 hanfei1991 hanfei1991 approved these changes

@fzhedu fzhedu fzhedu approved these changes

Assignees
No one assigned
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/L Denotes a PR that changes 100-499 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The query with single currency failed more than once when stop a tiflash az
7 participants
@windtalker @ti-chi-bot @sre-bot @hanfei1991 @ti-srebot @fzhedu @zhouqiang-cl