Unverified Commit 422917b3 authored by Maciej Borsz's avatar Maciej Borsz Committed by GitHub

Revert "Parallelize RC deletion in density test"

parent 48b0cb78
...@@ -357,23 +357,14 @@ func cleanupDensityTest(dtc DensityTestConfig, testPhaseDurations *timer.TestPha ...@@ -357,23 +357,14 @@ func cleanupDensityTest(dtc DensityTestConfig, testPhaseDurations *timer.TestPha
By("Deleting created Collections") By("Deleting created Collections")
numberOfClients := len(dtc.ClientSets) numberOfClients := len(dtc.ClientSets)
// We explicitly delete all pods to have API calls necessary for deletion accounted in metrics. // 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 { for i := range dtc.Configs {
name := dtc.Configs[i].GetName() name := dtc.Configs[i].GetName()
namespace := dtc.Configs[i].GetNamespace() namespace := dtc.Configs[i].GetNamespace()
kind := dtc.Configs[i].GetKind() kind := dtc.Configs[i].GetKind()
client := dtc.ClientSets[i%numberOfClients] By(fmt.Sprintf("Cleaning up only the %v, garbage collector will clean up the pods", kind))
go func() { err := framework.DeleteResourceAndWaitForGC(dtc.ClientSets[i%numberOfClients], kind, namespace, name)
defer GinkgoRecover() framework.ExpectNoError(err)
// 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)
}()
} }
wg.Wait()
podCleanupPhase.End() podCleanupPhase.End()
dtc.deleteSecrets(testPhaseDurations.StartPhase(910, "secrets deletion")) dtc.deleteSecrets(testPhaseDurations.StartPhase(910, "secrets deletion"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment