mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #126227 from sanposhiho/queueing_hint_execution_duration_seconds
feature: support queueing_hint_execution_duration_seconds metric
This commit is contained in:
commit
43691598da
@ -497,6 +497,7 @@ func (p *PriorityQueue) isPodWorthRequeuing(logger klog.Logger, pInfo *framework
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
hint, err := hintfn.QueueingHintFn(logger, pod, oldObj, newObj)
|
hint, err := hintfn.QueueingHintFn(logger, pod, oldObj, newObj)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If the QueueingHintFn returned an error, we should treat the event as Queue so that we can prevent
|
// If the QueueingHintFn returned an error, we should treat the event as Queue so that we can prevent
|
||||||
@ -509,6 +510,8 @@ func (p *PriorityQueue) isPodWorthRequeuing(logger klog.Logger, pInfo *framework
|
|||||||
}
|
}
|
||||||
hint = framework.Queue
|
hint = framework.Queue
|
||||||
}
|
}
|
||||||
|
p.metricsRecorder.ObserveQueueingHintDurationAsync(hintfn.PluginName, event.Label, queueingHintToLabel(hint, err), metrics.SinceInSeconds(start))
|
||||||
|
|
||||||
if hint == framework.QueueSkip {
|
if hint == framework.QueueSkip {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@ -536,6 +539,23 @@ func (p *PriorityQueue) isPodWorthRequeuing(logger klog.Logger, pInfo *framework
|
|||||||
return queueStrategy
|
return queueStrategy
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// queueingHintToLabel converts a hint and an error from QHint to a label string.
|
||||||
|
func queueingHintToLabel(hint framework.QueueingHint, err error) string {
|
||||||
|
if err != nil {
|
||||||
|
return metrics.QueueingHintResultError
|
||||||
|
}
|
||||||
|
|
||||||
|
switch hint {
|
||||||
|
case framework.Queue:
|
||||||
|
return metrics.QueueingHintResultQueue
|
||||||
|
case framework.QueueSkip:
|
||||||
|
return metrics.QueueingHintResultQueueSkip
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shouldn't reach here.
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// runPreEnqueuePlugins iterates PreEnqueue function in each registered PreEnqueuePlugin.
|
// runPreEnqueuePlugins iterates PreEnqueue function in each registered PreEnqueuePlugin.
|
||||||
// It returns true if all PreEnqueue function run successfully; otherwise returns false
|
// It returns true if all PreEnqueue function run successfully; otherwise returns false
|
||||||
// upon the first failure.
|
// upon the first failure.
|
||||||
|
@ -119,9 +119,19 @@ func NewMetricsAsyncRecorder(bufferSize int, interval time.Duration, stopCh <-ch
|
|||||||
// ObservePluginDurationAsync observes the plugin_execution_duration_seconds metric.
|
// ObservePluginDurationAsync observes the plugin_execution_duration_seconds metric.
|
||||||
// The metric will be flushed to Prometheus asynchronously.
|
// The metric will be flushed to Prometheus asynchronously.
|
||||||
func (r *MetricAsyncRecorder) ObservePluginDurationAsync(extensionPoint, pluginName, status string, value float64) {
|
func (r *MetricAsyncRecorder) ObservePluginDurationAsync(extensionPoint, pluginName, status string, value float64) {
|
||||||
|
r.observeMetricAsync(PluginExecutionDuration, value, pluginName, extensionPoint, status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ObserveQueueingHintDurationAsync observes the queueing_hint_execution_duration_seconds metric.
|
||||||
|
// The metric will be flushed to Prometheus asynchronously.
|
||||||
|
func (r *MetricAsyncRecorder) ObserveQueueingHintDurationAsync(pluginName, event, hint string, value float64) {
|
||||||
|
r.observeMetricAsync(queueingHintExecutionDuration, value, pluginName, event, hint)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *MetricAsyncRecorder) observeMetricAsync(m *metrics.HistogramVec, value float64, labelsValues ...string) {
|
||||||
newMetric := &metric{
|
newMetric := &metric{
|
||||||
metric: PluginExecutionDuration,
|
metric: m,
|
||||||
labelValues: []string{pluginName, extensionPoint, status},
|
labelValues: labelsValues,
|
||||||
value: value,
|
value: value,
|
||||||
}
|
}
|
||||||
select {
|
select {
|
||||||
|
@ -20,8 +20,10 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
||||||
"k8s.io/component-base/metrics"
|
"k8s.io/component-base/metrics"
|
||||||
"k8s.io/component-base/metrics/legacyregistry"
|
"k8s.io/component-base/metrics/legacyregistry"
|
||||||
|
"k8s.io/kubernetes/pkg/features"
|
||||||
volumebindingmetrics "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/metrics"
|
volumebindingmetrics "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/metrics"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -73,6 +75,12 @@ const (
|
|||||||
Permit = "Permit"
|
Permit = "Permit"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
QueueingHintResultQueue = "Queue"
|
||||||
|
QueueingHintResultQueueSkip = "QueueSkip"
|
||||||
|
QueueingHintResultError = "Error"
|
||||||
|
)
|
||||||
|
|
||||||
// All the histogram based metrics have 1ms as size for the smallest bucket.
|
// All the histogram based metrics have 1ms as size for the smallest bucket.
|
||||||
var (
|
var (
|
||||||
scheduleAttempts = metrics.NewCounterVec(
|
scheduleAttempts = metrics.NewCounterVec(
|
||||||
@ -198,6 +206,19 @@ var (
|
|||||||
},
|
},
|
||||||
[]string{"plugin", "extension_point", "status"})
|
[]string{"plugin", "extension_point", "status"})
|
||||||
|
|
||||||
|
// This is only available when the QHint feature gate is enabled.
|
||||||
|
queueingHintExecutionDuration = metrics.NewHistogramVec(
|
||||||
|
&metrics.HistogramOpts{
|
||||||
|
Subsystem: SchedulerSubsystem,
|
||||||
|
Name: "queueing_hint_execution_duration_seconds",
|
||||||
|
Help: "Duration for running a queueing hint function of a plugin.",
|
||||||
|
// Start with 0.01ms with the last bucket being [~22ms, Inf). We use a small factor (1.5)
|
||||||
|
// so that we have better granularity since plugin latency is very sensitive.
|
||||||
|
Buckets: metrics.ExponentialBuckets(0.00001, 1.5, 20),
|
||||||
|
StabilityLevel: metrics.ALPHA,
|
||||||
|
},
|
||||||
|
[]string{"plugin", "event", "hint"})
|
||||||
|
|
||||||
SchedulerQueueIncomingPods = metrics.NewCounterVec(
|
SchedulerQueueIncomingPods = metrics.NewCounterVec(
|
||||||
&metrics.CounterOpts{
|
&metrics.CounterOpts{
|
||||||
Subsystem: SchedulerSubsystem,
|
Subsystem: SchedulerSubsystem,
|
||||||
@ -269,6 +290,9 @@ func Register() {
|
|||||||
// Register the metrics.
|
// Register the metrics.
|
||||||
registerMetrics.Do(func() {
|
registerMetrics.Do(func() {
|
||||||
RegisterMetrics(metricsList...)
|
RegisterMetrics(metricsList...)
|
||||||
|
if utilfeature.DefaultFeatureGate.Enabled(features.SchedulerQueueingHints) {
|
||||||
|
RegisterMetrics(queueingHintExecutionDuration)
|
||||||
|
}
|
||||||
volumebindingmetrics.RegisterVolumeSchedulingMetrics()
|
volumebindingmetrics.RegisterVolumeSchedulingMetrics()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user