region: fix the potential panic . #7143

bufferflies · 2023-09-22T13:19:58Z

What problem does this PR solve?

Issue Number: Close #8915

What is changed and how does it work?

Check List

Tests

Unit test

Code changes

Side effects

Related changes

Release note

None.

ti-chi-bot · 2023-09-22T13:20:02Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

lhy1024
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.

Signed-off-by: bufferflies <[email protected]>

rleungx · 2023-09-26T06:05:40Z

pkg/core/region.go

+			//										t3: thread-B: update subtree
+			// t4: thread-A: update region subtree
+			// to keep region tree consistent with subtree, we need to drop this update.
+			if tree, ok := r.subRegions[region.GetID()]; ok {


Will it lose the update?

no, it keeps the region tree consistency with the sub tree.

pkg/core/region_test.go

pkg/core/region.go

Signed-off-by: bufferflies <[email protected]>

…panic

codecov · 2023-09-26T09:58:58Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.61%. Comparing base (849d80d) to head (cd83ac0).
Report is 718 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7143      +/-   ##
==========================================
+ Coverage   74.58%   74.61%   +0.02%     
==========================================
  Files         441      441              
  Lines       47292    47295       +3     
==========================================
+ Hits        35275    35291      +16     
+ Misses       8940     8924      -16     
- Partials     3077     3080       +3

Flag	Coverage Δ
unittests	`74.61% <100.00%> (+0.02%)`	⬆️

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

HuSharp · 2023-09-28T06:14:37Z

please link an issue :)

nolouch · 2023-09-28T07:29:02Z

/merge

ti-chi-bot · 2023-09-28T07:29:03Z

@nolouch: 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 · 2023-09-28T07:29:06Z

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

Commit hash: aca10dc

ti-chi-bot · 2023-09-28T09:20:03Z

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

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#4399 Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

nolouch · 2024-12-13T08:55:20Z

/run-cherry-picker

ti-chi-bot · 2024-12-13T08:55:46Z

In response to a cherrypick label: new pull request created to branch release-6.5: #8916.

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

ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Sep 22, 2023

ti-chi-bot bot requested review from HunDunDM and rleungx September 22, 2023 13:20

ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 22, 2023

panic

4c7584e

Signed-off-by: bufferflies <[email protected]>

bufferflies force-pushed the region_panic branch from 7f08329 to 4c7584e Compare September 22, 2023 13:20

Merge branch 'master' into region_panic

ef17759

rleungx reviewed Sep 26, 2023

View reviewed changes

lhy1024 reviewed Sep 26, 2023

View reviewed changes

pkg/core/region_test.go Show resolved Hide resolved

HuSharp reviewed Sep 26, 2023

View reviewed changes

pkg/core/region.go Outdated Show resolved Hide resolved

bufferflies added 2 commits September 26, 2023 17:37

add disable fail point

355abcb

Signed-off-by: bufferflies <[email protected]>

Merge branch 'region_panic' of github.com:bufferflies/pd into region_…

aca10dc

…panic

rleungx approved these changes Sep 28, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 28, 2023

lhy1024 approved these changes Sep 28, 2023

View reviewed changes

ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 28, 2023

ti-chi-bot bot removed the do-not-merge/needs-linked-issue label Sep 28, 2023

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 28, 2023

ti-chi-bot bot added 4 commits September 28, 2023 07:29

Merge branch 'master' into region_panic

f28d90d

Merge branch 'master' into region_panic

c335450

Merge branch 'master' into region_panic

8bd0469

Merge branch 'master' into region_panic

cd83ac0

ti-chi-bot bot merged commit 54219d6 into tikv:master Sep 28, 2023
19 checks passed

rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023

region: fix the potential panic . (tikv#7143)

4845a87

close tikv#4399 Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

nolouch added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Dec 13, 2024

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 13, 2024

This is an automated cherry-pick of tikv#7143

26f2704

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

ti-chi-bot mentioned this pull request Dec 13, 2024

region: fix the potential panic . (#7143) #8916

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

region: fix the potential panic . #7143

region: fix the potential panic . #7143

bufferflies commented Sep 22, 2023 •

edited by nolouch

Loading

ti-chi-bot bot commented Sep 22, 2023 •

edited

Loading

rleungx Sep 26, 2023

bufferflies Sep 26, 2023

codecov bot commented Sep 26, 2023 •

edited

Loading

HuSharp commented Sep 28, 2023

nolouch commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

nolouch commented Dec 13, 2024

ti-chi-bot commented Dec 13, 2024

region: fix the potential panic . #7143

region: fix the potential panic . #7143

Conversation

bufferflies commented Sep 22, 2023 • edited by nolouch Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Sep 22, 2023 • edited Loading

rleungx Sep 26, 2023

Choose a reason for hiding this comment

bufferflies Sep 26, 2023

Choose a reason for hiding this comment

codecov bot commented Sep 26, 2023 • edited Loading

Codecov Report

HuSharp commented Sep 28, 2023

nolouch commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

ti-chi-bot bot commented Sep 28, 2023

nolouch commented Dec 13, 2024

ti-chi-bot commented Dec 13, 2024

bufferflies commented Sep 22, 2023 •

edited by nolouch

Loading

ti-chi-bot bot commented Sep 22, 2023 •

edited

Loading

codecov bot commented Sep 26, 2023 •

edited

Loading