core: allow cancel load region #4175

disksing · 2021-09-28T07:35:04Z

What problem does this PR solve?

Fix #3936

What is changed and how it works?

add cancel support for core.LoadRegion functions
replace chan bool with contextes in region syncer client
add test case

Check List

Tests

Unit test

Release note

Fix the issue that PD may not elect leader as soon as leader step down

Signed-off-by: disksing <i@disksing.com>

ti-chi-bot · 2021-09-28T07:35:05Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

nolouch
rleungx

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.

server/core/storage_test.go

server/region_syncer/server.go

Signed-off-by: disksing <i@disksing.com>

server/region_syncer/server.go

This reverts commit 5b69c4a. Signed-off-by: disksing <i@disksing.com>

server/region_syncer/client.go

Signed-off-by: disksing <i@disksing.com>

codecov · 2021-10-12T07:35:06Z

Codecov Report

Merging #4175 (74758c4) into master (0a32ac8) will decrease coverage by 0.14%.
The diff coverage is 79.31%.

@@            Coverage Diff             @@
##           master    #4175      +/-   ##
==========================================
- Coverage   74.83%   74.69%   -0.15%     
==========================================
  Files         260      260              
  Lines       26641    26633       -8     
==========================================
- Hits        19937    19893      -44     
- Misses       4923     4954      +31     
- Partials     1781     1786       +5

Flag	Coverage Δ
unittests	`74.69% <79.31%> (-0.15%)`	⬇️

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

Impacted Files	Coverage Δ
server/cluster/cluster.go	`82.68% <0.00%> (+0.35%)`	⬆️
server/region_syncer/server.go	`88.97% <ø> (+5.75%)`	⬆️
server/core/storage.go	`68.04% <50.00%> (ø)`
server/core/region_storage.go	`75.26% <71.42%> (-0.32%)`	⬇️
server/region_syncer/client.go	`82.03% <94.11%> (+0.34%)`	⬆️
pkg/errs/errs.go	`75.00% <0.00%> (-25.00%)`	⬇️
server/tso/local_allocator.go	`64.86% <0.00%> (-13.52%)`	⬇️
server/election/leadership.go	`75.25% <0.00%> (-5.16%)`	⬇️
server/schedulers/random_merge.go	`60.00% <0.00%> (-3.34%)`	⬇️
pkg/dashboard/adapter/manager.go	`79.78% <0.00%> (-3.20%)`	⬇️
... and 11 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 0a32ac8...74758c4. Read the comment docs.

Signed-off-by: HunDunDM <hundundm@gmail.com>

server/region_syncer/client.go

Signed-off-by: disksing <i@disksing.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>

disksing · 2021-10-14T07:50:58Z

/merge

ti-chi-bot · 2021-10-14T07:50:59Z

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

/run-all-tests

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 · 2021-10-14T07:51:00Z

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

Commit hash: 74758c4

disksing · 2021-10-19T05:56:39Z

/run-cherry-picker

ti-chi-bot · 2021-10-19T05:57:12Z

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

ti-chi-bot · 2021-10-19T05:57:12Z

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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot · 2021-10-19T05:57:13Z

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

ti-chi-bot · 2021-10-19T05:57:13Z

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

* allow cancel load region Signed-off-by: disksing <i@disksing.com> * add test Signed-off-by: disksing <i@disksing.com> * minor update Signed-off-by: disksing <i@disksing.com> * address comment Signed-off-by: disksing <i@disksing.com> * Revert "address comment" This reverts commit 5b69c4a. Signed-off-by: disksing <i@disksing.com> * add log Signed-off-by: disksing <i@disksing.com> * merge clientCtx and regionSyncerCtx Signed-off-by: HunDunDM <hundundm@gmail.com> * Update server/region_syncer/client.go Signed-off-by: disksing <i@disksing.com> Co-authored-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: disksing <i@disksing.com> Co-authored-by: HunDunDM <hundundm@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>

* allow cancel load region Signed-off-by: disksing <i@disksing.com> * add test Signed-off-by: disksing <i@disksing.com> * minor update Signed-off-by: disksing <i@disksing.com> * address comment Signed-off-by: disksing <i@disksing.com> * Revert "address comment" This reverts commit 5b69c4a. Signed-off-by: disksing <i@disksing.com> * add log Signed-off-by: disksing <i@disksing.com> * merge clientCtx and regionSyncerCtx Signed-off-by: HunDunDM <hundundm@gmail.com> * Update server/region_syncer/client.go Signed-off-by: disksing <i@disksing.com> Co-authored-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ShuNing <nolouch@gmail.com> Co-authored-by: HunDunDM <hundundm@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io> Signed-off-by: hzh0425 <642256541@qq.com>

* This is an automated cherry-pick of #4175 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * resolve conflicts Signed-off-by: disksing <i@disksing.com> * fix compile ref #3936 Signed-off-by: disksing <i@disksing.com> * fix test Signed-off-by: disksing <i@disksing.com> * fix build Signed-off-by: disksing <i@disksing.com> Co-authored-by: disksing <i@disksing.com> Co-authored-by: ShuNing <nolouch@gmail.com>

Signed-off-by: disksing <i@disksing.com>

* allow cancel load region Signed-off-by: disksing <i@disksing.com>

disksing added 3 commits September 28, 2021 12:25

allow cancel load region

dba3916

Signed-off-by: disksing <i@disksing.com>

add test

201f21a

Signed-off-by: disksing <i@disksing.com>

minor update

4081e75

Signed-off-by: disksing <i@disksing.com>

disksing added the type/bugfix This PR fixes a bug. label Sep 28, 2021

disksing requested review from nolouch and Yisaer September 28, 2021 07:35

ti-chi-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 28, 2021

JmPotato reviewed Sep 28, 2021

View reviewed changes

server/core/storage_test.go Show resolved Hide resolved

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

nolouch and others added 3 commits October 9, 2021 11:42

Merge branch 'master' into issue-3936

c0938f6

address comment

5b69c4a

Signed-off-by: disksing <i@disksing.com>

Merge branch 'master' into issue-3936

1ea3ee8

disksing requested a review from JmPotato October 11, 2021 03:17

nolouch reviewed Oct 11, 2021

View reviewed changes

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

Revert "address comment"

e80e591

This reverts commit 5b69c4a. Signed-off-by: disksing <i@disksing.com>

disksing force-pushed the issue-3936 branch from f3097e4 to e80e591 Compare October 11, 2021 05:33

rleungx reviewed Oct 12, 2021

View reviewed changes

server/region_syncer/client.go Outdated Show resolved Hide resolved

rleungx reviewed Oct 12, 2021

View reviewed changes

server/region_syncer/client.go Show resolved Hide resolved

add log

94e3eff

Signed-off-by: disksing <i@disksing.com>

disksing and others added 2 commits October 12, 2021 15:51

Merge branch 'master' into issue-3936

4c19879

merge clientCtx and regionSyncerCtx

886b788

Signed-off-by: HunDunDM <hundundm@gmail.com>

rleungx reviewed Oct 12, 2021

View reviewed changes

server/region_syncer/client.go Outdated Show resolved Hide resolved

Update server/region_syncer/client.go

3dba704

Signed-off-by: disksing <i@disksing.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>

rleungx approved these changes Oct 13, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 13, 2021

nolouch approved these changes Oct 14, 2021

View reviewed changes

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 Oct 14, 2021

Merge branch 'master' into issue-3936

74758c4

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 14, 2021

Merge branch 'master' into issue-3936

fafb493

ti-chi-bot merged commit 335f384 into tikv:master Oct 14, 2021

disksing deleted the issue-3936 branch October 14, 2021 13:06

This was referenced Oct 19, 2021

core: allow cancel load region (#4175) #4217

Merged

core: allow cancel load region (#4175) #4218

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Oct 19, 2021

This is an automated cherry-pick of tikv#4175

0a4652a

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

This was referenced Oct 19, 2021

core: allow cancel load region (#4175) #4219

Merged

core: allow cancel load region (#4175) #4220

Merged

HunDunDM mentioned this pull request Nov 5, 2021

region_syncer: fix blocking bugs through ctx #3766

Closed

disksing pushed a commit that referenced this pull request Nov 30, 2021

core: allow cancel load region (#4175) (#4217)

9615a4a

Signed-off-by: disksing <i@disksing.com>

disksing pushed a commit that referenced this pull request Dec 1, 2021

core: allow cancel load region (#4175) (#4218)

b940d5d

* allow cancel load region Signed-off-by: disksing <i@disksing.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: allow cancel load region #4175

core: allow cancel load region #4175

disksing commented Sep 28, 2021

ti-chi-bot commented Sep 28, 2021 •

edited

Loading

codecov bot commented Oct 12, 2021 •

edited

Loading

disksing commented Oct 14, 2021

ti-chi-bot commented Oct 14, 2021

ti-chi-bot commented Oct 14, 2021

disksing commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

core: allow cancel load region #4175

core: allow cancel load region #4175

Conversation

disksing commented Sep 28, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

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

codecov bot commented Oct 12, 2021 • edited Loading

Codecov Report

disksing commented Oct 14, 2021

ti-chi-bot commented Oct 14, 2021

ti-chi-bot commented Oct 14, 2021

disksing commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Oct 19, 2021

ti-chi-bot commented Sep 28, 2021 •

edited

Loading

codecov bot commented Oct 12, 2021 •

edited

Loading