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

Merge pull request #52426 from shyamjvs/dont-crash-on-missing-data 

Automatic merge from submit-queue

Don't crash density test on missing a single measurement

We failed our last run due to this (https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-performance/33) and didn't have pod-startup latency recorded at all.
pull/6/head
Kubernetes Submit Queue 2017-09-14 05:09:46 -07:00 committed by GitHub
parent e6209113e4 4f3e3c6278
commit 3c8fb4b90f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/scalability/density.go
View File

@ -58,6 +58,9 @@ const (
// Maximum container failures this test tolerates before failing. // Maximum container failures this test tolerates before failing.
var MaxContainerFailures = 0 var MaxContainerFailures = 0
// Maximum no. of missing measurements related to pod-startup that the test tolerates.
var MaxMissingPodStartupMeasurements = 0
type DensityTestConfig struct { type DensityTestConfig struct {
Configs []testutils.RunObjectConfig Configs []testutils.RunObjectConfig
ClientSets []clientset.Interface ClientSets []clientset.Interface
@ -310,6 +313,7 @@ var _ = SIGDescribe("Density", func() {
var masters sets.String var masters sets.String
testCaseBaseName := "density" testCaseBaseName := "density"
missingMeasurements := 0
// Gathers data prior to framework namespace teardown // Gathers data prior to framework namespace teardown
AfterEach(func() { AfterEach(func() {
@ -345,6 +349,9 @@ var _ = SIGDescribe("Density", func() {
} }
framework.PrintSummaries(summaries, testCaseBaseName) framework.PrintSummaries(summaries, testCaseBaseName)
// Fail if more than the allowed threshold of measurements were missing in the latencyTest.
Expect(missingMeasurements <= MaxMissingPodStartupMeasurements).To(Equal(true))
}) })
options := framework.FrameworkOptions{ options := framework.FrameworkOptions{
@ -717,23 +724,23 @@ var _ = SIGDescribe("Density", func() {
sched, ok := scheduleTimes[name] sched, ok := scheduleTimes[name]
if !ok { if !ok {
framework.Logf("Failed to find schedule time for %v", name) framework.Logf("Failed to find schedule time for %v", name)
missingMeasurements++
} }
Expect(ok).To(Equal(true))
run, ok := runTimes[name] run, ok := runTimes[name]
if !ok { if !ok {
framework.Logf("Failed to find run time for %v", name) framework.Logf("Failed to find run time for %v", name)
missingMeasurements++
} }
Expect(ok).To(Equal(true))
watch, ok := watchTimes[name] watch, ok := watchTimes[name]
if !ok { if !ok {
framework.Logf("Failed to find watch time for %v", name) framework.Logf("Failed to find watch time for %v", name)
missingMeasurements++
} }
Expect(ok).To(Equal(true))
node, ok := nodeNames[name] node, ok := nodeNames[name]
if !ok { if !ok {
framework.Logf("Failed to find node for %v", name) framework.Logf("Failed to find node for %v", name)
missingMeasurements++
} }
Expect(ok).To(Equal(true))
scheduleLag = append(scheduleLag, framework.PodLatencyData{Name: name, Node: node, Latency: sched.Time.Sub(create.Time)}) scheduleLag = append(scheduleLag, framework.PodLatencyData{Name: name, Node: node, Latency: sched.Time.Sub(create.Time)})
startupLag = append(startupLag, framework.PodLatencyData{Name: name, Node: node, Latency: run.Time.Sub(sched.Time)}) startupLag = append(startupLag, framework.PodLatencyData{Name: name, Node: node, Latency: run.Time.Sub(sched.Time)})