github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

add throughput in perf data and disable --cgroups-per-qos

Browse Source
This commit is contained in:
Zhou Fang 2016-08-22 16:04:32 -07:00
parent d6afd304b7
commit ac379b038e
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/e2e_node/benchmark_util.go
View File

@ -20,6 +20,7 @@ package e2e_node
import ( import (
"sort" "sort"
"time"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -28,9 +29,9 @@ import (
const ( const (
// TODO(coufon): be consistent with perf_util.go version // TODO(coufon): be consistent with perf_util.go version
currentTimeSeriesVersion = "v1" currentDataVersion = "v1"
TimeSeriesTag = "[Result:TimeSeries]" TimeSeriesTag = "[Result:TimeSeries]"
TimeSeriesEnd = "[Finish:TimeSeries]" TimeSeriesEnd = "[Finish:TimeSeries]"
) )
type NodeTimeSeries struct { type NodeTimeSeries struct {
@ -48,7 +49,7 @@ func logDensityTimeSeries(rc *ResourceCollector, create, watch map[string]unvers
"node": framework.TestContext.NodeName, "node": framework.TestContext.NodeName,
"test": testName, "test": testName,
}, },
Version: currentTimeSeriesVersion, Version: currentDataVersion,
} }
// Attach operation time series. // Attach operation time series.
timeSeries.OperationData = map[string][]int64{ timeSeries.OperationData = map[string][]int64{
@ -78,10 +79,10 @@ func getCumulatedPodTimeSeries(timePerPod map[string]unversioned.Time) []int64 {
return timeSeries return timeSeries
} }
// getLatencyPerfData returns perf data from latency // getLatencyPerfData returns perf data of pod startup latency.
func getLatencyPerfData(latency framework.LatencyMetric, testName string) *perftype.PerfData { func getLatencyPerfData(latency framework.LatencyMetric, testName string) *perftype.PerfData {
return &perftype.PerfData{ return &perftype.PerfData{
Version: "v1", Version: currentDataVersion,
DataItems: []perftype.DataItem{ DataItems: []perftype.DataItem{
{ {
Data: map[string]float64{ Data: map[string]float64{
@ -103,3 +104,27 @@ func getLatencyPerfData(latency framework.LatencyMetric, testName string) *perft
}, },
} }
} }
// getThroughputPerfData returns perf data of pod creation startup throughput.
func getThroughputPerfData(batchLag time.Duration, e2eLags []framework.PodLatencyData, podsNr int, testName string) *perftype.PerfData {
return &perftype.PerfData{
Version: currentDataVersion,
DataItems: []perftype.DataItem{
{
Data: map[string]float64{
"batch": float64(podsNr) / batchLag.Minutes(),
"single-worst": 1.0 / e2eLags[len(e2eLags)-1].Latency.Minutes(),
},
Unit: "pods/min",
Labels: map[string]string{
"datatype": "throughput",
"latencytype": "create-pod",
},
},
},
Labels: map[string]string{
"node": framework.TestContext.NodeName,
"test": testName,
},
}
}

14
test/e2e_node/density_test.go
View File

@ -343,12 +343,13 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg
sort.Sort(framework.LatencySlice(e2eLags)) sort.Sort(framework.LatencySlice(e2eLags))
batchLag := lastRunning.Time.Sub(firstCreate.Time) batchLag := lastRunning.Time.Sub(firstCreate.Time)
testName := testArg.getTestName()
// Log time series data. // Log time series data.
if isLogTimeSeries { if isLogTimeSeries {
logDensityTimeSeries(rc, createTimes, watchTimes, testArg.getTestName()) logDensityTimeSeries(rc, createTimes, watchTimes, testName)
} }
// Log throughput data. // Log throughput data.
logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr) logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testName)
return batchLag, e2eLags return batchLag, e2eLags
} }
@ -376,7 +377,7 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de
batchlag, e2eLags := createBatchPodSequential(f, testPods) batchlag, e2eLags := createBatchPodSequential(f, testPods)
// Log throughput data. // Log throughput data.
logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr) logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testArg.getTestName())
return batchlag, e2eLags return batchlag, e2eLags
} }
@ -526,9 +527,6 @@ func logAndVerifyLatency(batchLag time.Duration, e2eLags []framework.PodLatencyD
} }
// logThroughput calculates and logs pod creation throughput. // logThroughput calculates and logs pod creation throughput.
func logPodCreateThroughput(batchLag time.Duration, e2eLags []framework.PodLatencyData, podsNr int) { func logPodCreateThroughput(batchLag time.Duration, e2eLags []framework.PodLatencyData, podsNr int, testName string) {
throughputBatch := float64(podsNr) / batchLag.Minutes() framework.PrintPerfData(getThroughputPerfData(batchLag, e2eLags, podsNr, testName))
framework.Logf("Batch creation throughput is %.1f pods/min", throughputBatch)
throughputSequential := 1.0 / e2eLags[len(e2eLags)-1].Latency.Minutes()
framework.Logf("Sequential creation throughput is %.1f pods/min", throughputSequential)
} }

2
test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties
View File

@ -5,5 +5,5 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]"' GINKGO_FLAGS='--skip="\[Flaky\]"'
SETUP_NODE=false SETUP_NODE=false
TEST_ARGS=--cgroups-per-qos=false #TEST_ARGS=--cgroups-per-qos=false
PARALLELISM=1 PARALLELISM=1