Fix scheduler performance regression after adding plugin metrics

This commit is contained in:
Antoni Zawodny 2023-04-25 16:18:05 +02:00
parent 1d116c437c
commit 28519e240e
2 changed files with 68 additions and 2 deletions

View File

@ -358,6 +358,20 @@ func NewFramework(r Registry, profile *config.KubeSchedulerProfile, stopCh <-cha
options.captureProfile(outputProfile)
}
// Cache metric streams for prefilter and filter plugins.
for i, pl := range f.preFilterPlugins {
f.preFilterPlugins[i] = &instrumentedPreFilterPlugin{
PreFilterPlugin: f.preFilterPlugins[i],
metric: metrics.PluginEvaluationTotal.WithLabelValues(pl.Name(), metrics.PreFilter, f.profileName),
}
}
for i, pl := range f.filterPlugins {
f.filterPlugins[i] = &instrumentedFilterPlugin{
FilterPlugin: f.filterPlugins[i],
metric: metrics.PluginEvaluationTotal.WithLabelValues(pl.Name(), metrics.Filter, f.profileName),
}
}
return f, nil
}
@ -614,7 +628,6 @@ func (f *frameworkImpl) RunPreFilterPlugins(ctx context.Context, state *framewor
skipPlugins.Insert(pl.Name())
continue
}
metrics.PluginEvaluationTotal.WithLabelValues(pl.Name(), metrics.PreFilter, f.profileName).Inc()
if !s.IsSuccess() {
s.SetFailedPlugin(pl.Name())
if s.IsUnschedulable() {
@ -732,7 +745,6 @@ func (f *frameworkImpl) RunFilterPlugins(
if state.SkipFilterPlugins.Has(pl.Name()) {
continue
}
metrics.PluginEvaluationTotal.WithLabelValues(pl.Name(), metrics.Filter, f.profileName).Inc()
if status := f.runFilterPlugin(ctx, pl, state, pod, nodeInfo); !status.IsSuccess() {
if !status.IsUnschedulable() {
// Filter plugins are not supposed to return any status other than

View File

@ -0,0 +1,54 @@
/*
Copyright 2023 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package runtime
import (
"context"
v1 "k8s.io/api/core/v1"
compbasemetrics "k8s.io/component-base/metrics"
"k8s.io/kubernetes/pkg/scheduler/framework"
)
type instrumentedFilterPlugin struct {
framework.FilterPlugin
metric compbasemetrics.CounterMetric
}
var _ framework.FilterPlugin = &instrumentedFilterPlugin{}
func (p *instrumentedFilterPlugin) Filter(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeInfo *framework.NodeInfo) *framework.Status {
p.metric.Inc()
return p.FilterPlugin.Filter(ctx, state, pod, nodeInfo)
}
type instrumentedPreFilterPlugin struct {
framework.PreFilterPlugin
metric compbasemetrics.CounterMetric
}
var _ framework.PreFilterPlugin = &instrumentedPreFilterPlugin{}
func (p *instrumentedPreFilterPlugin) PreFilter(ctx context.Context, state *framework.CycleState, pod *v1.Pod) (*framework.PreFilterResult, *framework.Status) {
result, status := p.PreFilterPlugin.PreFilter(ctx, state, pod)
if !status.IsSkip() {
p.metric.Inc()
}
return result, status
}