From 98051aaba2403dd0ad0120f428c137adc2c6534b Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sat, 25 Apr 2020 22:01:21 -0400 Subject: [PATCH 1/3] Fix race condition in logging --- test/e2e/instrumentation/logging/generic_soak.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index ec54ec7f768..d3cf09ec1bf 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -58,6 +58,7 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti var wg sync.WaitGroup wg.Add(loggingSoak.Scale) for i := 0; i < loggingSoak.Scale; i++ { + i := i go func() { defer wg.Done() defer ginkgo.GinkgoRecover() From 8240f21753d49d70d646049e8a826d081e1b89fa Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sun, 26 Apr 2020 11:10:00 -0400 Subject: [PATCH 2/3] Convert index variable to interface{} --- test/e2e/instrumentation/logging/generic_soak.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index d3cf09ec1bf..f7743a17fd8 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -58,15 +58,14 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti var wg sync.WaitGroup wg.Add(loggingSoak.Scale) for i := 0; i < loggingSoak.Scale; i++ { - i := i - go func() { + go func(i interface{}) { defer wg.Done() defer ginkgo.GinkgoRecover() wave := fmt.Sprintf("wave%v", strconv.Itoa(i)) framework.Logf("Starting logging soak, wave = %v", wave) RunLogPodsWithSleepOf(f, kbRateInSeconds, wave, totalLogTime) framework.Logf("Completed logging soak, wave %v", i) - }() + }(i) // Niceness. time.Sleep(loggingSoak.TimeBetweenWaves) } From 93fa760c0a9a7141b3cad1ef447cd0f9f028bed7 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Mon, 11 May 2020 08:40:27 -0400 Subject: [PATCH 3/3] Code review changes --- test/e2e/instrumentation/logging/generic_soak.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index f7743a17fd8..742aff717ba 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -58,7 +58,7 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti var wg sync.WaitGroup wg.Add(loggingSoak.Scale) for i := 0; i < loggingSoak.Scale; i++ { - go func(i interface{}) { + go func(i int) { defer wg.Done() defer ginkgo.GinkgoRecover() wave := fmt.Sprintf("wave%v", strconv.Itoa(i))