Merge pull request #59574 from shyamjvs/fix-scale-tests-profiling-bug

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix bug with profile-gathering waitgroup in scale tests This bug has caused panic due to: ``` I0208 14:11:52.955] [91m[1mTest Panicked[0m I0208 14:11:52.955] [91msync: negative WaitGroup counter[0m ``` e.g failure - https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-kubemark-500-gce/11818) /cc @wojtek-t ```release-note NONE ```

Merge pull request #59574 from shyamjvs/fix-scale-tests-profiling-bug
7f145e0a · Kubernetes Submit Queue · GitHub · 9a3d2795 · db0a3721 · 7f145e0a
Unverified Commit 7f145e0a authored Feb 08, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

density.go test/e2e/scalability/density.go +1 -0

load.go test/e2e/scalability/load.go +1 -0

No files found.
--- a/test/e2e/scalability/density.go
+++ b/test/e2e/scalability/density.go
@@ -363,6 +363,7 @@ var _ = SIGDescribe("Density", func() {
 		// Stop apiserver CPU profile gatherer and gather memory allocations profile.
 		close(profileGathererStopCh)
 		wg := sync.WaitGroup{}
+		wg.Add(1)
 		framework.GatherApiserverMemoryProfile(&wg, "density")
 		wg.Wait()


--- a/test/e2e/scalability/load.go
+++ b/test/e2e/scalability/load.go
@@ -104,6 +104,7 @@ var _ = SIGDescribe("Load capacity", func() {
 		// Stop apiserver CPU profile gatherer and gather memory allocations profile.
 		close(profileGathererStopCh)
 		wg := sync.WaitGroup{}
+		wg.Add(1)
 		framework.GatherApiserverMemoryProfile(&wg, "load")
 		wg.Wait()