diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go index b4ccfed4093..0b9bc02f927 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go @@ -64,11 +64,9 @@ func (cfgCtlr *configController) dumpPriorityLevels(w http.ResponseWriter, r *ht } tabPrint(tabWriter, rowForHeaders(columnHeaders)) endLine(tabWriter) - plNames := make([]string, len(cfgCtlr.priorityLevelStates)) - i := 0 + plNames := make([]string, 0, len(cfgCtlr.priorityLevelStates)) for plName := range cfgCtlr.priorityLevelStates { - plNames[i] = plName - i++ + plNames = append(plNames, plName) } sort.Strings(plNames) for i := range plNames { diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go index 823e1cf34a2..f93e6a828ee 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go @@ -181,7 +181,7 @@ func (cfgCtlr *configController) Handle(ctx context.Context, requestDigest Reque metrics.ObserveWaitingDuration(ctx, pl.Name, fs.Name, strconv.FormatBool(req != nil), time.Since(startWaitingTime)) } metrics.AddDispatch(ctx, pl.Name, fs.Name) - fqs.OnRequestDispatched(ctx, req) + fqs.OnRequestDispatched(req) executed = true startExecutionTime := time.Now() defer func() { diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go index 8671b509840..71470d1b9db 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go @@ -1071,7 +1071,7 @@ func (qs *queueSet) Dump(includeRequestDetails bool) debug.QueueSetDump { return d } -func OnRequestDispatched(ctx context.Context, r fq.Request) { +func OnRequestDispatched(r fq.Request) { req, ok := r.(*request) if !ok { return @@ -1079,7 +1079,7 @@ func OnRequestDispatched(ctx context.Context, r fq.Request) { qs := req.qs if qs != nil { - qs.lockAndSyncTime(ctx) + qs.lock.Lock() defer qs.lock.Unlock() qs.totRequestsDispatched++ }