Skip to content

Commit fbdd0d7

Browse files
authored
Merge pull request kubernetes#106727 from MikeSpreitzer/fix-106726
Correct Generator calls for executing seat count
2 parents 874dc87 + 95964c5 commit fbdd0d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func (meal *cfgMeal) digestNewPLsLocked(newPLs []*flowcontrol.PriorityLevelConfi
539539
state := meal.cfgCtlr.priorityLevelStates[pl.Name]
540540
if state == nil {
541541
labelValues := []string{pl.Name}
542-
state = &priorityLevelState{reqsObsPair: meal.cfgCtlr.reqsObsPairGenerator.Generate(1, 1, labelValues), execSeatsObs: meal.cfgCtlr.execSeatsObsGenerator.Generate(1, 1, labelValues)}
542+
state = &priorityLevelState{reqsObsPair: meal.cfgCtlr.reqsObsPairGenerator.Generate(1, 1, labelValues), execSeatsObs: meal.cfgCtlr.execSeatsObsGenerator.Generate(0, 1, labelValues)}
543543
}
544544
qsCompleter, err := queueSetCompleterForPL(meal.cfgCtlr.queueSetFactory, state.queues, pl, meal.cfgCtlr.requestWaitLimit, state.reqsObsPair, state.execSeatsObs)
545545
if err != nil {
@@ -769,7 +769,7 @@ func (meal *cfgMeal) imaginePL(proto *flowcontrol.PriorityLevelConfiguration, re
769769
klog.V(3).Infof("No %s PriorityLevelConfiguration found, imagining one", proto.Name)
770770
labelValues := []string{proto.Name}
771771
reqsObsPair := meal.cfgCtlr.reqsObsPairGenerator.Generate(1, 1, labelValues)
772-
execSeatsObs := meal.cfgCtlr.execSeatsObsGenerator.Generate(1, 1, labelValues)
772+
execSeatsObs := meal.cfgCtlr.execSeatsObsGenerator.Generate(0, 1, labelValues)
773773
qsCompleter, err := queueSetCompleterForPL(meal.cfgCtlr.queueSetFactory, nil, proto, requestWaitLimit, reqsObsPair, execSeatsObs)
774774
if err != nil {
775775
// This can not happen because proto is one of the mandatory

0 commit comments

Comments
 (0)