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

unsafe recovery: Fix lock contention #8013

Merged
merged 2 commits into from
Apr 2, 2024
Merged

unsafe recovery: Fix lock contention #8013

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8464af0
Remove overlap check
v01dstar Apr 1, 2024
400cd7b
Fix go style
v01dstar Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions server/cluster/unsafe_recovery_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func (u *unsafeRecoveryController) generatePlan(newestRegionTree *regionTree, pe
}
fallthrough
case createEmptyRegion:
if hasPlan, err = u.generateCreateEmptyRegionPlan(newestRegionTree, peersMap); hasPlan && err == nil {
if hasPlan, err = u.generateCreateEmptyRegionPlan(newestRegionTree); hasPlan && err == nil {
u.changeStage(createEmptyRegion)
break
}
Expand Down Expand Up @@ -1104,7 +1104,7 @@ func (u *unsafeRecoveryController) generateDemoteFailedVoterPlan(newestRegionTre
return hasPlan
}

func (u *unsafeRecoveryController) generateCreateEmptyRegionPlan(newestRegionTree *regionTree, peersMap map[uint64][]*regionItem) (bool, error) {
func (u *unsafeRecoveryController) generateCreateEmptyRegionPlan(newestRegionTree *regionTree) (bool, error) {
if u.err != nil {
return false, nil
}
Expand Down Expand Up @@ -1159,25 +1159,6 @@ func (u *unsafeRecoveryController) generateCreateEmptyRegionPlan(newestRegionTre
err = createRegionErr
return false
}
// paranoid check: shouldn't overlap with any of the peers
for _, peers := range peersMap {
for _, peer := range peers {
if !peer.IsInitialized() {
continue
}
if (bytes.Compare(newRegion.StartKey, peer.Region().StartKey) <= 0 &&
(len(newRegion.EndKey) == 0 || bytes.Compare(peer.Region().StartKey, newRegion.EndKey) < 0)) ||
((len(peer.Region().EndKey) == 0 || bytes.Compare(newRegion.StartKey, peer.Region().EndKey) < 0) &&
(len(newRegion.EndKey) == 0 || (len(peer.Region().EndKey) != 0 && bytes.Compare(peer.Region().EndKey, newRegion.EndKey) <= 0))) {
err = errors.Errorf(
"Find overlap peer %v with newly created empty region %v",
logutil.RedactStringer(core.RegionToHexMeta(peer.Region())),
logutil.RedactStringer(core.RegionToHexMeta(newRegion)),
)
return false
}
}
}
storeRecoveryPlan := u.getRecoveryPlan(storeID)
storeRecoveryPlan.Creates = append(storeRecoveryPlan.Creates, newRegion)
u.recordAffectedRegion(newRegion)
Expand Down
Loading