Skip to content

mmaprototype: fix doneFunc #158109

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

mmaprototype: fix doneFunc #158109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions pkg/kv/kvserver/allocator/mmaprototype/constraint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ func (rac *rangeAnalyzedConstraints) finishInit(
rac.numNeededReplicas[nonVoterIndex] = spanConfig.numReplicas - spanConfig.numVoters
rac.replicas = rac.buf.replicas

analyzeFunc := func(ac *analyzedConstraints) {
analyzeFunc := func(ac *analyzedConstraints, isVoterConstraints bool) {
if len(ac.constraints) == 0 {
// Nothing to do.
return
Expand Down Expand Up @@ -880,6 +880,11 @@ func (rac *rangeAnalyzedConstraints) finishInit(
// oversatisfying.
for j := range ac.constraints {
doneFunc := func() bool {
if isVoterConstraints {
// For voter constraints, only voters can satisfy them.
return len(ac.satisfiedByReplica[voterIndex][j]) >= int(ac.constraints[j].numReplicas)
}
// For all-replica constraints, both voters and non-voters count.
return len(ac.satisfiedByReplica[voterIndex][j])+
len(ac.satisfiedByReplica[nonVoterIndex][j]) >= int(ac.constraints[j].numReplicas)
}
Expand Down Expand Up @@ -930,11 +935,11 @@ func (rac *rangeAnalyzedConstraints) finishInit(
}
if spanConfig.constraints != nil {
rac.constraints.constraints = spanConfig.constraints
analyzeFunc(&rac.constraints)
analyzeFunc(&rac.constraints, false /* isVoterConstraints */)
}
if spanConfig.voterConstraints != nil {
rac.voterConstraints.constraints = spanConfig.voterConstraints
analyzeFunc(&rac.voterConstraints)
analyzeFunc(&rac.voterConstraints, true /* isVoterConstraints */)
}

rac.leaseholderID = leaseholder
Expand Down