Merge pull request #46801 from dashpole/summary_container_restart

Automatic merge from submit-queue [Flaky PR Test] Fix summary test fixes issue: #46797 As we can see in the [example failure build log](https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-node-kubelet/4319/build-log.txt), the summary containers are pinging google 100s of times a second. This causes the summary container to be killed occasionally, and fail the test. The summary containers are only supposed to ping every 10 seconds according to the current test. As it turns out, we were missing a semicolon, and were not sleeping between pings. For background, we ping google to generate network traffic, so that the summary test can validate network metrics. This PR adds the semicolon to make the container sleep between calls, and decreases the sleep time from 10 seconds to 1 second, as 1 call / 10 seconds did not produce enough activity. cc @kubernetes/kubernetes-build-cops @dchen1107

Merge pull request #46801 from dashpole/summary_container_restart
d063ce21 · Kubernetes Submit Queue · GitHub · 310ea94b · d1545e1e · d063ce21
Commit d063ce21 authored Jun 02, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

garbage_collector_test.go test/e2e_node/garbage_collector_test.go +1 -1

summary_test.go test/e2e_node/summary_test.go +1 -1

No files found.
--- a/test/e2e_node/garbage_collector_test.go
+++ b/test/e2e_node/garbage_collector_test.go
@@ -312,7 +312,7 @@ func getRestartingContainerCommand(path string, containerNum int, restarts int32
 			if [ $count -lt %d ]; then
 				exit 0
 			fi
-			while true; do %s sleep 10; done`,
+			while true; do %s sleep 1; done`,
 			path, strconv.Itoa(containerNum), restarts+1, loopingCommand),
 	}
 }

--- a/test/e2e_node/summary_test.go
+++ b/test/e2e_node/summary_test.go
@@ -285,7 +285,7 @@ func getSummaryTestPods(f *framework.Framework, numRestarts int32, names ...stri
 					{
 						Name:    "busybox-container",
 						Image:   "gcr.io/google_containers/busybox:1.24",
-						Command: getRestartingContainerCommand("/test-empty-dir-mnt", 0, numRestarts, "ping -c 1 google.com; echo 'hello world' >> /test-empty-dir-mnt/file"),
+						Command: getRestartingContainerCommand("/test-empty-dir-mnt", 0, numRestarts, "ping -c 1 google.com; echo 'hello world' >> /test-empty-dir-mnt/file;"),
 						Resources: v1.ResourceRequirements{
 							Limits: v1.ResourceList{
 								// Must set memory limit to get MemoryStats.AvailableBytes