From 422917b30b7e51f199c53977cd65c9def4140ac4 Mon Sep 17 00:00:00 2001 From: Maciej Borsz Date: Fri, 24 Aug 2018 09:47:09 +0200 Subject: [PATCH] Revert "Parallelize RC deletion in density test" --- test/e2e/scalability/density.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/test/e2e/scalability/density.go b/test/e2e/scalability/density.go index c95ecb99b15..c966119be79 100644 --- a/test/e2e/scalability/density.go +++ b/test/e2e/scalability/density.go @@ -357,23 +357,14 @@ func cleanupDensityTest(dtc DensityTestConfig, testPhaseDurations *timer.TestPha By("Deleting created Collections") numberOfClients := len(dtc.ClientSets) // We explicitly delete all pods to have API calls necessary for deletion accounted in metrics. - wg := sync.WaitGroup{} - wg.Add(len(dtc.Configs)) for i := range dtc.Configs { name := dtc.Configs[i].GetName() namespace := dtc.Configs[i].GetNamespace() kind := dtc.Configs[i].GetKind() - client := dtc.ClientSets[i%numberOfClients] - go func() { - defer GinkgoRecover() - // Call wg.Done() in defer to avoid blocking whole test - // in case of error from RunRC. - defer wg.Done() - err := framework.DeleteResourceAndWaitForGC(client, kind, namespace, name) - framework.ExpectNoError(err) - }() + By(fmt.Sprintf("Cleaning up only the %v, garbage collector will clean up the pods", kind)) + err := framework.DeleteResourceAndWaitForGC(dtc.ClientSets[i%numberOfClients], kind, namespace, name) + framework.ExpectNoError(err) } - wg.Wait() podCleanupPhase.End() dtc.deleteSecrets(testPhaseDurations.StartPhase(910, "secrets deletion"))