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

store/copr: invalidate stale regions for Mpp query. (#24410) #24432

Merged
merged 5 commits into from
Jun 18, 2021
Merged

store/copr: invalidate stale regions for Mpp query. (#24410) #24432

merged 5 commits into from
Jun 18, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 6, 2021 •
edited
Loading

cherry-pick #24410 to release-5.0
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/24432

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

git push git@github.com:ti-srebot/tidb.git pr/24432:release-5.0-c269b117054a

What problem does this PR solve?

Problem Summary:
Right now, we won't update the stale regions during executing Mpp queries. Then we added the try regions field in MppDispatchTask reponse. In this pr, we try to invalidate the stale regions in the mppr response.

What is changed and how it works?

Related changes

pingcap/kvproto#751

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    • Insert data continously
    • observe that tiflash is retrying regions. In my case, the log is like ["DAGQueryBlockInterpreter: Start to retry 1 regions (10936,)"]
    • observe log in tidb, find ["invalid region because tiflash detected stale region"] ["region id"="{ region id: 10936, ver: 116, confVer: 2 }"] proving this function works.

Release note

  • store/copr: invalidate stale regions for Mpp query.

@hanfei1991 @ti-srebot
cherry pick pingcap#24410 to release-5.0
c078991 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request May 6, 2021
Merged
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick labels May 6, 2021
@ti-srebot ti-srebot requested a review from qw4990 May 6, 2021 10:10
@ti-chi-bot ti-chi-bot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 6, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 6, 2021
@ti-chi-bot ti-chi-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 6, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 13, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 29, 2021
@hanfei1991 hanfei1991 closed this Jun 4, 2021
@hanfei1991 hanfei1991 reopened this Jun 4, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 15, 2021
@hanfei1991
Copy link
Member

/run-all-tests

xiongjiwei
xiongjiwei reviewed Jun 18, 2021
View reviewed changes
store/copr/mpp.go Outdated
@@ -243,6 +243,13 @@ func (m *mppIterator) handleDispatchReq(ctx context.Context, bo *tikv.Backoffer,
m.sendError(errors.New(realResp.Error.Msg))
return
}
if len(realResp.RetryRegions) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

why we need this if

Copy link
Member

Choose a reason for hiding this comment

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

It's unnecessary, I will fix it

@xiongjiwei
Copy link
Contributor

/run-check_dev

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 18, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qw4990
  • xiongjiwei

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 18, 2021
@zhouqiang-cl zhouqiang-cl added backport-5.0.3 cherry-pick-approved Cherry pick PR approved by release team. labels Jun 18, 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: 149e5a8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 18, 2021
@hanfei1991
Copy link
Member

/merge

@hanfei1991
Copy link
Member

/merge

@ti-chi-bot ti-chi-bot merged commit 59e2f48 into pingcap:release-5.0 Jun 18, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.3 Jun 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanfei1991 hanfei1991 hanfei1991 left review comments

@qw4990 qw4990 qw4990 approved these changes

@xiongjiwei xiongjiwei xiongjiwei approved these changes

Assignees

@hanfei1991 hanfei1991

Labels
cherry-pick-approved Cherry pick PR approved by release team. 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.0-cherry-pick
Projects
None yet
Milestone
v5.0.3
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @hanfei1991 @xiongjiwei @ti-chi-bot @qw4990 @zhouqiang-cl