*: fix scheduling can not immediately start after transfer leader #4875

rleungx · 2022-04-29T02:59:48Z

Signed-off-by: Ryan Leung [email protected]

What problem does this PR solve?

Issue Number: Close #4769.

What is changed and how does it work?

This PR uses the flag to distinguish if the region's heartbeat is new when transferring the PD leader.

Check List

Tests

Unit test

Release note

Fix the issue that scheduling cannot immediately start after PD leader transfers

ti-chi-bot · 2022-04-29T02:59:49Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

AndreMouche
JmPotato

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.

codecov · 2022-04-29T07:10:38Z

Codecov Report

Merging #4875 (54e8fc1) into master (562586c) will decrease coverage by 0.04%.
The diff coverage is 83.33%.

❗ Current head 54e8fc1 differs from pull request most recent head f297bf2. Consider uploading reports for the commit f297bf2 to get more accurate results

@@            Coverage Diff             @@
##           master    #4875      +/-   ##
==========================================
- Coverage   75.45%   75.40%   -0.05%     
==========================================
  Files         298      297       -1     
  Lines       29532    29506      -26     
==========================================
- Hits        22282    22250      -32     
- Misses       5318     5328      +10     
+ Partials     1932     1928       -4

Flag	Coverage Δ
unittests	`75.40% <83.33%> (-0.05%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
server/cluster/cluster.go	`83.30% <33.33%> (-1.39%)`	⬇️
server/region_syncer/client.go	`85.82% <50.00%> (+0.10%)`	⬆️
server/cluster/coordinator.go	`72.74% <100.00%> (-0.92%)`	⬇️
server/cluster/prepare_checker.go	`100.00% <100.00%> (ø)`
server/core/region.go	`91.17% <100.00%> (+0.05%)`	⬆️
server/core/region_option.go	`82.85% <100.00%> (+0.33%)`	⬆️
server/grpc_service.go	`53.00% <100.00%> (ø)`
server/schedulers/shuffle_hot_region.go	`55.55% <0.00%> (-10.11%)`	⬇️
server/id/id.go	`76.19% <0.00%> (-4.77%)`	⬇️
server/member/member.go	`64.21% <0.00%> (-3.16%)`	⬇️
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7088c95...f297bf2. Read the comment docs.

server/cluster/cluster.go

JmPotato

LGTM. BTW, do we need to triage this issue first to see which version it affects before merging it?

rleungx · 2022-05-16T06:26:18Z

LGTM. BTW, do we need to triage this issue first to see which version it affects before merging it?

Done

AndreMouche · 2022-05-16T06:32:55Z

server/cluster/cluster.go

@@ -746,6 +746,11 @@ func (c *RaftCluster) processReportBuckets(buckets *metapb.Buckets) error {
 	return nil
 }

+// IsPrepared return if the prepare checker is ready.


Suggested change

// IsPrepared return if the prepare checker is ready.

// IsPrepared returns true if the prepare checker is ready.

AndreMouche · 2022-05-16T07:03:15Z

server/cluster/cluster.go

@@ -812,7 +817,7 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
 		regionEventCounter.WithLabelValues("update_cache").Inc()
 	}

-	if isNew {
+	if !c.IsPrepared() && isNew {


Could we check the condition in the function collect directly?

AndreMouche · 2022-05-16T07:08:09Z

server/cluster/coordinator.go

@@ -310,6 +311,9 @@ func (c *coordinator) runUntilStop() {
 }

 func (c *coordinator) run() {
+	failpoint.Inject("runSchedulerCheckInterval", func() {


Could we change the Ticker instead of runSchedulerCheckInterval? So we can keep runSchedulerCheckInterval as a constant.
For example , re define the ticker after L317

failpoint.Inject("runSchedulerCheckInterval", func() { ticker = time.NewTicker(100 * time.Millisecond) })

ti-chi-bot · 2022-05-17T09:10:48Z

@rleungx: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:25:14Z

In response to a cherrypick label: new pull request created: #4967.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:25:50Z

In response to a cherrypick label: new pull request created: #4969.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:26:27Z

In response to a cherrypick label: new pull request created: #4970.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:27:04Z

In response to a cherrypick label: new pull request created: #4971.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:27:40Z

In response to a cherrypick label: new pull request created: #4972.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:28:17Z

In response to a cherrypick label: new pull request created: #4973.

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-17T09:28:53Z

In response to a cherrypick label: new pull request created: #4974.

) (#4969) close #4769, ref #4875 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

) (#4974) close #4769, ref #4875 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

) (#4970) close #4769, ref #4875 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

) (#4967) close #4769, ref #4875 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

) (#4973) close #4769, ref #4875 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

ti-chi-bot added do-not-merge/needs-triage-completed release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 29, 2022

ti-chi-bot requested review from JmPotato and lhy1024 April 29, 2022 02:59

rleungx changed the title *: fix the issue that scheduling can not immediately start after transfe… *: fix scheduling can not immediately start after transfer leader Apr 29, 2022

rleungx force-pushed the fix-issue-4769 branch from f8399aa to cdbcdd7 Compare April 29, 2022 07:03

rleungx force-pushed the fix-issue-4769 branch from cdbcdd7 to 1beeaa3 Compare April 29, 2022 07:16

rleungx marked this pull request as ready for review April 29, 2022 07:23

ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 29, 2022

JmPotato reviewed May 10, 2022

View reviewed changes

server/cluster/cluster.go Outdated Show resolved Hide resolved

JmPotato reviewed May 11, 2022

View reviewed changes

server/cluster/cluster.go Outdated Show resolved Hide resolved

rleungx force-pushed the fix-issue-4769 branch from 1beeaa3 to 6f63f63 Compare May 11, 2022 03:06

JmPotato approved these changes May 11, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 11, 2022

rleungx requested a review from HunDunDM May 11, 2022 03:56

rleungx removed the needs-cherry-pick-release-6.0 The PR needs to cherry pick to release-6.0 branch. label May 16, 2022

AndreMouche reviewed May 16, 2022

View reviewed changes

ti-chi-bot added 2 commits May 17, 2022 17:05

Merge branch 'master' into fix-issue-4769

04b24dd

Merge branch 'master' into fix-issue-4769

f297bf2

ti-chi-bot merged commit 429b492 into tikv:master May 17, 2022

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

4e61080

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4967

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

dcabcac

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4969

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

ece1235

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4970

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

8ef9b7b

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4971

Closed

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

82ecde4

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4972

Closed

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

c9eaba5

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4973

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request May 17, 2022

This is an automated cherry-pick of tikv#4875

af90839

close tikv#4769 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 17, 2022

*: fix scheduling can not immediately start after transfer leader (#4875) #4974

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: fix scheduling can not immediately start after transfer leader #4875

*: fix scheduling can not immediately start after transfer leader #4875

rleungx commented Apr 29, 2022 •

edited

Loading

ti-chi-bot commented Apr 29, 2022 •

edited

Loading

codecov bot commented Apr 29, 2022 •

edited

Loading

JmPotato left a comment

rleungx commented May 16, 2022

AndreMouche May 16, 2022

AndreMouche May 16, 2022

AndreMouche May 16, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

	// IsPrepared return if the prepare checker is ready.
	// IsPrepared returns true if the prepare checker is ready.

*: fix scheduling can not immediately start after transfer leader #4875

*: fix scheduling can not immediately start after transfer leader #4875

Conversation

rleungx commented Apr 29, 2022 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot commented Apr 29, 2022 • edited Loading

codecov bot commented Apr 29, 2022 • edited Loading

Codecov Report

JmPotato left a comment

Choose a reason for hiding this comment

rleungx commented May 16, 2022

AndreMouche May 16, 2022

Choose a reason for hiding this comment

AndreMouche May 16, 2022

Choose a reason for hiding this comment

AndreMouche May 16, 2022

Choose a reason for hiding this comment

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

ti-chi-bot commented May 17, 2022

rleungx commented Apr 29, 2022 •

edited

Loading

ti-chi-bot commented Apr 29, 2022 •

edited

Loading

codecov bot commented Apr 29, 2022 •

edited

Loading