github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Parallelize RC deletion in density test"

Browse Source
This commit is contained in:
Maciej Borsz 2018-08-24 09:47:09 +02:00 committed by GitHub
parent 48b0cb7810
commit 422917b30b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/scalability/density.go
View File

@ -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()
// 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) framework.ExpectNoError(err)
}()
} }
wg.Wait()
podCleanupPhase.End() podCleanupPhase.End()
dtc.deleteSecrets(testPhaseDurations.StartPhase(910, "secrets deletion")) dtc.deleteSecrets(testPhaseDurations.StartPhase(910, "secrets deletion"))