github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split scheduler latency metric to fine-grained steps

pull/8/head
Shyam Jeedigunta 2018-06-21 12:57:31 +02:00
parent 83ad4d9e96
commit b9ae20c99e
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/core/generic_scheduler.go
View File

@ -142,6 +142,7 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
} }
} }
metrics.SchedulingAlgorithmPredicateEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPredicateEvalTime)) metrics.SchedulingAlgorithmPredicateEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPredicateEvalTime))
metrics.SchedulingLatency.WithLabelValues(metrics.PredicateEvaluation).Observe(metrics.SinceInSeconds(startPredicateEvalTime))
trace.Step("Prioritizing") trace.Step("Prioritizing")
startPriorityEvalTime := time.Now() startPriorityEvalTime := time.Now()
@ -157,6 +158,7 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
return "", err return "", err
} }
metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime)) metrics.SchedulingAlgorithmPriorityEvaluationDuration.Observe(metrics.SinceInMicroseconds(startPriorityEvalTime))
metrics.SchedulingLatency.WithLabelValues(metrics.PriorityEvaluation).Observe(metrics.SinceInSeconds(startPriorityEvalTime))
trace.Step("Selecting host") trace.Step("Selecting host")
return g.selectHost(priorityList) return g.selectHost(priorityList)

10
pkg/scheduler/metrics/metrics.go
View File

@ -31,10 +31,16 @@ const (
// OperationLabel - operation label name // OperationLabel - operation label name
OperationLabel = "operation" OperationLabel = "operation"
// Below are possible values for the operation label. Each represents a substep of e2e scheduling:
// PredicateEvaluation - predicate evaluation operation label value
PredicateEvaluation = "predicate_evaluation"
// PriorityEvaluation - priority evaluation operation label value
PriorityEvaluation = "priority_evaluation"
// PreemptionEvaluation - preemption evaluation operation label value (occurs in case of scheduling fitError).
PreemptionEvaluation = "preemption_evaluation"
// Binding - binding operation label value // Binding - binding operation label value
Binding = "binding" Binding = "binding"
// SelectingNode - selecting node operation label value
SelectingNode = "selecting_node"
// E2eScheduling - e2e scheduling operation label value // E2eScheduling - e2e scheduling operation label value
) )

2
pkg/scheduler/scheduler.go
View File

@ -460,11 +460,11 @@ func (sched *Scheduler) scheduleOne() {
sched.preempt(pod, fitError) sched.preempt(pod, fitError)
metrics.PreemptionAttempts.Inc() metrics.PreemptionAttempts.Inc()
metrics.SchedulingAlgorithmPremptionEvaluationDuration.Observe(metrics.SinceInMicroseconds(preemptionStartTime)) metrics.SchedulingAlgorithmPremptionEvaluationDuration.Observe(metrics.SinceInMicroseconds(preemptionStartTime))
metrics.SchedulingLatency.WithLabelValues(metrics.PreemptionEvaluation).Observe(metrics.SinceInSeconds(preemptionStartTime))
} }
return return
} }
metrics.SchedulingAlgorithmLatency.Observe(metrics.SinceInMicroseconds(start)) metrics.SchedulingAlgorithmLatency.Observe(metrics.SinceInMicroseconds(start))
metrics.SchedulingLatency.WithLabelValues(metrics.SelectingNode).Observe(metrics.SinceInSeconds(start))
// Tell the cache to assume that a pod now is running on a given node, even though it hasn't been bound yet. // Tell the cache to assume that a pod now is running on a given node, even though it hasn't been bound yet.
// This allows us to keep scheduling without waiting on binding to occur. // This allows us to keep scheduling without waiting on binding to occur.
assumedPod := pod.DeepCopy() assumedPod := pod.DeepCopy()

22
test/e2e/framework/metrics_util.go
View File

@ -210,12 +210,14 @@ func (l *PodStartupLatency) PrintJSON() string {
} }
type SchedulingMetrics struct { type SchedulingMetrics struct {
SelectingNodeLatency LatencyMetric `json:"selectingNodeLatency"` PredicateEvaluationLatency LatencyMetric `json:"predicateEvaluationLatency"`
BindingLatency LatencyMetric `json:"bindingLatency"` PriorityEvaluationLatency LatencyMetric `json:"priorityEvaluationLatency"`
ThroughputAverage float64 `json:"throughputAverage"` PreemptionEvaluationLatency LatencyMetric `json:"preemptionEvaluationLatency"`
ThroughputPerc50 float64 `json:"throughputPerc50"` BindingLatency LatencyMetric `json:"bindingLatency"`
ThroughputPerc90 float64 `json:"throughputPerc90"` ThroughputAverage float64 `json:"throughputAverage"`
ThroughputPerc99 float64 `json:"throughputPerc99"` ThroughputPerc50 float64 `json:"throughputPerc50"`
ThroughputPerc90 float64 `json:"throughputPerc90"`
ThroughputPerc99 float64 `json:"throughputPerc99"`
} }
func (l *SchedulingMetrics) SummaryKind() string { func (l *SchedulingMetrics) SummaryKind() string {
@ -511,8 +513,12 @@ func getSchedulingLatency(c clientset.Interface) (*SchedulingMetrics, error) {
var metric *LatencyMetric = nil var metric *LatencyMetric = nil
switch sample.Metric[schedulermetric.OperationLabel] { switch sample.Metric[schedulermetric.OperationLabel] {
case schedulermetric.SelectingNode: case schedulermetric.PredicateEvaluation:
metric = &result.SelectingNodeLatency metric = &result.PredicateEvaluationLatency
case schedulermetric.PriorityEvaluation:
metric = &result.PriorityEvaluationLatency
case schedulermetric.PreemptionEvaluation:
metric = &result.PreemptionEvaluationLatency
case schedulermetric.Binding: case schedulermetric.Binding:
metric = &result.BindingLatency metric = &result.BindingLatency
} }