github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Remove dependency for benchmark integration tests from e2e fw

Browse Source
This commit is contained in:
drfish 2020-03-18 15:57:37 +08:00
parent 22a4c2cda1
commit 6cad278a8c
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/benchmark/jsonify/BUILD
View File

@ -5,10 +5,7 @@ go_library(
srcs = ["main.go"], srcs = ["main.go"],
importpath = "k8s.io/kubernetes/test/integration/benchmark/jsonify", importpath = "k8s.io/kubernetes/test/integration/benchmark/jsonify",
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = ["//vendor/golang.org/x/tools/benchmark/parse:go_default_library"],
"//test/e2e/perftype:go_default_library",
"//vendor/golang.org/x/tools/benchmark/parse:go_default_library",
],
) )
go_binary( go_binary(

35
test/integration/benchmark/jsonify/main.go
View File

@ -24,9 +24,36 @@ import (
"os" "os"
benchparse "golang.org/x/tools/benchmark/parse" benchparse "golang.org/x/tools/benchmark/parse"
"k8s.io/kubernetes/test/e2e/perftype"
) )
// TODO(random-liu): Replace this with prometheus' data model.
// The following performance data structures are generalized and well-formatted.
// They can be pretty printed in json format and be analyzed by other performance
// analyzing tools, such as Perfdash (k8s.io/contrib/perfdash).
// DataItem is the data point.
type DataItem struct {
// Data is a map from bucket to real data point (e.g. "Perc90" -> 23.5). Notice
// that all data items with the same label combination should have the same buckets.
Data map[string]float64 `json:"data"`
// Unit is the data unit. Notice that all data items with the same label combination
// should have the same unit.
Unit string `json:"unit"`
// Labels is the labels of the data item.
Labels map[string]string `json:"labels,omitempty"`
}
// PerfData contains all data items generated in current test.
type PerfData struct {
// Version is the version of the metrics. The metrics consumer could use the version
// to detect metrics version change and decide what version to support.
Version string `json:"version"`
DataItems []DataItem `json:"dataItems"`
// Labels is the labels of the dataset.
Labels map[string]string `json:"labels,omitempty"`
}
func main() { func main() {
err := run() err := run()
if err != nil { if err != nil {
@ -42,7 +69,7 @@ func run() error {
if err != nil { if err != nil {
return err return err
} }
data := perftype.PerfData{Version: "v1"} data := PerfData{Version: "v1"}
for _, benchMarks := range benchmarkSet { for _, benchMarks := range benchmarkSet {
for _, benchMark := range benchMarks { for _, benchMark := range benchMarks {
data.DataItems = appendIfMeasured(data.DataItems, benchMark, benchparse.NsPerOp, "time", "μs", benchMark.NsPerOp/1000.0) data.DataItems = appendIfMeasured(data.DataItems, benchMark, benchparse.NsPerOp, "time", "μs", benchMark.NsPerOp/1000.0)
@ -63,11 +90,11 @@ func run() error {
return ioutil.WriteFile(os.Args[1], formatted.Bytes(), 0664) return ioutil.WriteFile(os.Args[1], formatted.Bytes(), 0664)
} }
func appendIfMeasured(items []perftype.DataItem, benchmark *benchparse.Benchmark, metricType int, metricName string, unit string, value float64) []perftype.DataItem { func appendIfMeasured(items []DataItem, benchmark *benchparse.Benchmark, metricType int, metricName string, unit string, value float64) []DataItem {
if metricType != 0 && (benchmark.Measured&metricType) == 0 { if metricType != 0 && (benchmark.Measured&metricType) == 0 {
return items return items
} }
return append(items, perftype.DataItem{ return append(items, DataItem{
Unit: unit, Unit: unit,
Labels: map[string]string{ Labels: map[string]string{
"benchmark": benchmark.Name, "benchmark": benchmark.Name,