From c9abcfa5122dd5bb734d0600aa6b71ff8171031f Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Fri, 26 Feb 2016 15:37:35 +0100
Subject: [PATCH] Add a cluster saturation time check to the Density test

---
 test/e2e/density.go      | 27 ++++++++++++++++++++++++---
 test/e2e/metrics_util.go |  9 ++++++++-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/test/e2e/density.go b/test/e2e/density.go
index c618aa87439..9db4a5716f6 100644
--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -41,7 +41,11 @@ import (
 )
 
 // NodeStartupThreshold is a rough estimate of the time allocated for a pod to start on a node.
-const NodeStartupThreshold = 4 * time.Second
+const (
+	NodeStartupThreshold       = 4 * time.Second
+	MinSaturationThreshold     = 2 * time.Minute
+	MinPodsPerSecondThroughput = 10
+)
 
 // Maximum container failures this test tolerates before failing.
 var MaxContainerFailures = 0
@@ -115,9 +119,19 @@ var _ = Describe("Density", func() {
 	var additionalPodsPrefix string
 	var ns string
 	var uuid string
+	var e2eStartupTime time.Duration
+	var totalPods int
 
 	// Gathers data prior to framework namespace teardown
 	AfterEach(func() {
+		saturationData := SaturationTime{
+			TimeToSaturate: e2eStartupTime,
+			NumberOfNodes:  nodeCount,
+			NumberOfPods:   totalPods,
+			Throughput:     float32(totalPods) / float32(e2eStartupTime/time.Second),
+		}
+		Logf("Cluster saturation time: %s", prettyPrintJSON(saturationData))
+
 		// Verify latency metrics.
 		highLatencyRequests, err := HighLatencyRequests(c)
 		expectNoError(err)
@@ -204,7 +218,7 @@ var _ = Describe("Density", func() {
 		}
 		itArg := testArg
 		It(name, func() {
-			totalPods := itArg.podsPerNode * nodeCount
+			totalPods = itArg.podsPerNode * nodeCount
 			RCName = "density" + strconv.Itoa(totalPods) + "-" + uuid
 			fileHndl, err := os.Create(fmt.Sprintf(testContext.OutputDir+"/%s/pod_states.csv", uuid))
 			expectNoError(err)
@@ -276,8 +290,9 @@ var _ = Describe("Density", func() {
 			// Start the replication controller.
 			startTime := time.Now()
 			expectNoError(RunRC(config))
-			e2eStartupTime := time.Now().Sub(startTime)
+			e2eStartupTime = time.Now().Sub(startTime)
 			Logf("E2E startup time for %d pods: %v", totalPods, e2eStartupTime)
+			Logf("Throughput during cluster saturation phase: %v", float32(totalPods)/float32(e2eStartupTime))
 
 			By("Waiting for all events to be recorded")
 			last := -1
@@ -484,6 +499,12 @@ var _ = Describe("Density", func() {
 				name := additionalPodsPrefix + "-" + strconv.Itoa(i)
 				c.Pods(ns).Delete(name, nil)
 			}
+
+			saturationThreshold := time.Duration((totalPods / MinPodsPerSecondThroughput)) * time.Second
+			if saturationThreshold < MinSaturationThreshold {
+				saturationThreshold = MinSaturationThreshold
+			}
+			Expect(e2eStartupTime).NotTo(BeNumerically(">", saturationThreshold))
 		})
 	}
 })
diff --git a/test/e2e/metrics_util.go b/test/e2e/metrics_util.go
index af2bc86ea51..a26aca2d443 100644
--- a/test/e2e/metrics_util.go
+++ b/test/e2e/metrics_util.go
@@ -124,11 +124,18 @@ type PodStartupLatency struct {
 }
 
 type SchedulingLatency struct {
-	Scheduling LatencyMetric `json:"scheduling:`
+	Scheduling LatencyMetric `json:"scheduling"`
 	Binding    LatencyMetric `json:"binding"`
 	Total      LatencyMetric `json:"total"`
 }
 
+type SaturationTime struct {
+	TimeToSaturate time.Duration `json:"timeToStaturate"`
+	NumberOfNodes  int           `json:"numberOfNodes"`
+	NumberOfPods   int           `json:"numberOfPods"`
+	Throughput     float32       `json:"throughput"`
+}
+
 type APICall struct {
 	Resource string        `json:"resource"`
 	Verb     string        `json:"verb"`