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

[raftstore-v2]: check apply_scheduler before using in on_refresh_region_buckets #14526

Merged
merged 8 commits into from
Apr 8, 2023
Merged

[raftstore-v2]: check apply_scheduler before using in on_refresh_region_buckets #14526

merged 8 commits into from
Apr 8, 2023

Conversation

tonyxuqqi
Copy link
Contributor

What is changed and how it works?

Issue Number: Close #14506

What's Changed:

check apply_scheduler before using it in on_refresh_region_buckets.
This is to solve the race condition when the peer is just created by split meanwhile a refresh bucket is called immediately.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note 

None

@tonyxuqqi
check apply_scheduler before using in on_refresh_region_buckets
c6c0a15 
Signed-off-by: tonyxuqqi <tonyxuqi@outlook.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 5, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bufferflies
  • tabokie

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.

@tonyxuqqi tonyxuqqi requested a review from BusyJay April 5, 2023 05:48
@tonyxuqqi tonyxuqqi requested a review from tabokie April 5, 2023 05:48
tabokie
tabokie reviewed Apr 5, 2023
View reviewed changes
components/raftstore-v2/src/operation/command/mod.rs
@@ -148,6 +148,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
.apply_pool
.spawn(async move { apply_fsm.handle_all_tasks().await })
.unwrap();
fail::fail_point!("deplay_set_apply_scheduler", |_| {});
self.set_apply_scheduler(apply_scheduler);
Copy link
Member

Choose a reason for hiding this comment

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

Why not set it before spawning?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why not set it before spawning?

Is there any benefit to put it before spawning? The spawning itself is not going to take long time either.
The key here is to delay the set_apply_scheduler being called, so making this fail_point just prior to it is more precise. Though, in fact the delay could happen at any place when the OS thread is switched.

Copy link
Member

Choose a reason for hiding this comment

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

Forget it, I thought it's a race between Apply::handle_all_tasks.

@tonyxuqqi
fix compile
911e840 
Signed-off-by: tonyxuqqi <tonyxuqi@outlook.com>
@tonyxuqqi
fix lint
b096c67 
Signed-off-by: tonyxuqqi <tonyxuqi@outlook.com>
@tonyxuqqi
fix lint
7a58c54 
Signed-off-by: tonyxuqqi <tonyxuqi@outlook.com>
@tonyxuqqi
fix lint
208853f 
Signed-off-by: tonyxuqqi <tonyxuqi@outlook.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Status: PR - There is already 1 approval label Apr 6, 2023
@ti-chi-bot ti-chi-bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels Apr 6, 2023
tonyxuqqi and others added 3 commits April 6, 2023 17:00
@tonyxuqqi
Copy link
Contributor Author

/test

1 similar comment
@tonyxuqqi
Copy link
Contributor Author

/test

@tonyxuqqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@tonyxuqqi: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

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

Commit hash: 66012f7

@ti-chi-bot ti-chi-bot added the status/can-merge Status: Can merge to base branch label Apr 7, 2023
@tonyxuqqi
Copy link
Contributor Author

/test

@ti-chi-bot ti-chi-bot merged commit abb672b into tikv:master Apr 8, 2023
@ti-chi-bot ti-chi-bot added this to the Pool milestone Apr 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bufferflies bufferflies bufferflies approved these changes

@tabokie tabokie tabokie approved these changes

@BusyJay BusyJay Awaiting requested review from BusyJay

Assignees
No one assigned
Labels
release-note-none size/L status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals
Projects
None yet
Milestone
Pool
Development

Successfully merging this pull request may close these issues.

[Dynamic Regions] bucket refresh panic
4 participants
@tonyxuqqi @ti-chi-bot @bufferflies @tabokie