Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clusterloader2: drop metrics deprecated in 1.19 #1172

Merged
merged 1 commit into from
Apr 17, 2020
Merged

clusterloader2: drop metrics deprecated in 1.19 #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 10 additions & 28 deletions clusterloader2/pkg/measurement/common/scheduler_latency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"fmt"
"math"
"strconv"
"strings"
"time"

Expand All @@ -42,7 +41,7 @@ const (
e2eSchedulingDurationMetricName = model.LabelValue(schedulermetric.SchedulerSubsystem + "_e2e_scheduling_duration_seconds_bucket")
schedulingAlgorithmDurationMetricName = model.LabelValue(schedulermetric.SchedulerSubsystem + "_scheduling_algorithm_duration_seconds_bucket")
frameworkExtensionPointDurationMetricName = model.LabelValue(schedulermetric.SchedulerSubsystem + "_framework_extension_point_duration_seconds_bucket")
schedulingLatencyMetricName = model.LabelValue(schedulermetric.SchedulerSubsystem + "_" + schedulermetric.DeprecatedSchedulingDurationName)
preemptionEvaluationMetricName = model.LabelValue(schedulermetric.SchedulerSubsystem + "_scheduling_algorithm_preemption_evaluation_seconds_bucket")

singleRestCallTimeout = 5 * time.Minute
)
Expand Down Expand Up @@ -161,6 +160,7 @@ func (s *schedulerLatencyMeasurement) getSchedulingLatency(c clientset.Interface

e2eSchedulingDurationHist := measurementutil.NewHistogram(nil)
schedulingAlgorithmDurationHist := measurementutil.NewHistogram(nil)
preemptionEvaluationHist := measurementutil.NewHistogram(nil)

frameworkExtensionPointDurationHist := make(map[string]*measurementutil.Histogram)
for _, ePoint := range extentionsPoints {
Expand All @@ -179,25 +179,8 @@ func (s *schedulerLatencyMeasurement) getSchedulingLatency(c clientset.Interface
if _, exists := frameworkExtensionPointDurationHist[ePoint]; exists {
measurementutil.ConvertSampleToHistogram(sample, frameworkExtensionPointDurationHist[ePoint])
}
case schedulingLatencyMetricName:
var metric *measurementutil.LatencyMetric
switch sample.Metric[schedulermetric.OperationLabel] {
case schedulermetric.PredicateEvaluation:
metric = &result.PredicateEvaluationLatency
case schedulermetric.PriorityEvaluation:
metric = &result.PriorityEvaluationLatency
case schedulermetric.PreemptionEvaluation:
metric = &result.PreemptionEvaluationLatency
case schedulermetric.Binding:
metric = &result.BindingLatency
}
if metric != nil {
quantile, err := strconv.ParseFloat(string(sample.Metric[model.QuantileLabel]), 64)
if err != nil {
return nil, err
}
metric.SetQuantile(quantile, time.Duration(int64(float64(sample.Value)*float64(time.Second))))
}
case preemptionEvaluationMetricName:
measurementutil.ConvertSampleToHistogram(sample, preemptionEvaluationHist)
}
}

Expand All @@ -214,6 +197,10 @@ func (s *schedulerLatencyMeasurement) getSchedulingLatency(c clientset.Interface
}
}

if err := s.setQuantileFromHistogram(&result.PreemptionEvaluationLatency, preemptionEvaluationHist); err != nil {
return nil, err
}

content, err := util.PrettyPrintJSON(result)
if err != nil {
return nil, err
Expand Down Expand Up @@ -278,14 +265,9 @@ func (s *schedulerLatencyMeasurement) sendRequestToScheduler(c clientset.Interfa
}

type schedulingMetrics struct {
PredicateEvaluationLatency measurementutil.LatencyMetric `json:"predicateEvaluationLatency"`
PriorityEvaluationLatency measurementutil.LatencyMetric `json:"priorityEvaluationLatency"`
BindingLatency measurementutil.LatencyMetric `json:"bindingLatency"`

FrameworkExtensionPointDuration map[string]*measurementutil.LatencyMetric `json:"frameworkExtensionPointDuration"`

PreemptionEvaluationLatency measurementutil.LatencyMetric `json:"preemptionEvaluationLatency"`
E2eSchedulingLatency measurementutil.LatencyMetric `json:"e2eSchedulingLatency"`
PreemptionEvaluationLatency measurementutil.LatencyMetric `json:"preemptionEvaluationLatency"`
E2eSchedulingLatency measurementutil.LatencyMetric `json:"e2eSchedulingLatency"`

// To track scheduling latency without binding, this allows to easier present the ceiling of the scheduler throughput.
SchedulingLatency measurementutil.LatencyMetric `json:"schedulingLatency"`
Expand Down
28 changes: 2 additions & 26 deletions perfdash/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@ import (
"k8s.io/kubernetes/test/e2e/perftype"
)

var (
extentionsPoints = []string{
"PreFilter",
"Filter",
"PreScore",
"Score",
"PreBind",
"Bind",
"PostBind",
"Reserve",
"Unreserve",
"Permit",
}
)

func stripCount(data *perftype.DataItem) {
delete(data.Labels, "Count")
}
Expand Down Expand Up @@ -261,10 +246,7 @@ type latencyMetric struct {
}

type schedulingMetrics struct {
PredicateEvaluationLatency latencyMetric `json:"predicateEvaluationLatency"`
PriorityEvaluationLatency latencyMetric `json:"priorityEvaluationLatency"`
PreemptionEvaluationLatency latencyMetric `json:"preemptionEvaluationLatency"`
BindingLatency latencyMetric `json:"bindingLatency"`
E2eSchedulingLatency latencyMetric `json:"e2eSchedulingLatency"`
SchedulingLatency latencyMetric `json:"schedulingLatency"`
ThroughputAverage float64 `json:"throughputAverage"`
Expand All @@ -291,21 +273,15 @@ func parseSchedulingLatency(data []byte, buildNumber int, testResult *BuildData)
klog.Errorf("error parsing JSON in build %d: %v %s", buildNumber, err, string(data))
return
}
predicateEvaluation := parseOperationLatency(obj.PredicateEvaluationLatency, "predicate_evaluation")
testResult.Builds[build] = append(testResult.Builds[build], predicateEvaluation)
priorityEvaluation := parseOperationLatency(obj.PriorityEvaluationLatency, "priority_evaluation")
testResult.Builds[build] = append(testResult.Builds[build], priorityEvaluation)
preemptionEvaluation := parseOperationLatency(obj.PreemptionEvaluationLatency, "preemption_evaluation")
testResult.Builds[build] = append(testResult.Builds[build], preemptionEvaluation)
binding := parseOperationLatency(obj.BindingLatency, "binding")
testResult.Builds[build] = append(testResult.Builds[build], binding)
e2eScheduling := parseOperationLatency(obj.E2eSchedulingLatency, "e2eScheduling")
testResult.Builds[build] = append(testResult.Builds[build], e2eScheduling)
scheduling := parseOperationLatency(obj.SchedulingLatency, "scheduling")
testResult.Builds[build] = append(testResult.Builds[build], scheduling)

for _, ePoint := range extentionsPoints {
frameworkExtensionPointDuration := parseOperationLatency(obj.FrameworkExtensionPointDuration[ePoint], fmt.Sprintf("extension_point_duration_%v_latency", strings.ToLower(ePoint)))
for name, metric := range obj.FrameworkExtensionPointDuration {
frameworkExtensionPointDuration := parseOperationLatency(metric, name)
testResult.Builds[build] = append(testResult.Builds[build], frameworkExtensionPointDuration)
}
}
Expand Down