github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Revert using ginkgo.DeferCleanup as it doesn't run in the correct order

Browse Source
This commit is contained in:
Mahmoud Atwa 2024-01-16 10:45:36 +00:00
parent 73565cde13
commit 80fbc4c319
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@ -1007,7 +1007,8 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
// 70% of allocatable memory of a single node * replica count, forcing a scale up in case of normal pods // 70% of allocatable memory of a single node * replica count, forcing a scale up in case of normal pods
replicaCount := 2 * nodeCount replicaCount := 2 * nodeCount
reservedMemory := int(float64(replicaCount) * float64(0.7) * float64(memAllocatableMb)) reservedMemory := int(float64(replicaCount) * float64(0.7) * float64(memAllocatableMb))
ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName)) cleanupFunc := ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName)
defer cleanupFunc()
// Verify that cluster size is increased // Verify that cluster size is increased
ginkgo.By("Waiting for cluster scale-up") ginkgo.By("Waiting for cluster scale-up")
sizeFunc := func(size int) bool { sizeFunc := func(size int) bool {
@ -1020,7 +1021,8 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
// 50% of allocatable memory of a single node, so that no scale up would trigger in normal cases // 50% of allocatable memory of a single node, so that no scale up would trigger in normal cases
replicaCount := 1 replicaCount := 1
reservedMemory := int(float64(0.5) * float64(memAllocatableMb)) reservedMemory := int(float64(0.5) * float64(memAllocatableMb))
ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName)) cleanupFunc := ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName)
defer cleanupFunc()
// Verify that cluster size is the same // Verify that cluster size is the same
ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String())) ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String()))
sizeFunc := func(size int) bool { sizeFunc := func(size int) bool {
@ -1035,7 +1037,8 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
replicaCount := 2 * nodeCount replicaCount := 2 * nodeCount
reservedMemory := int(float64(replicaCount) * float64(0.7) * float64(memAllocatableMb)) reservedMemory := int(float64(replicaCount) * float64(0.7) * float64(memAllocatableMb))
schedulerName := "non-existent-scheduler-" + f.UniqueName schedulerName := "non-existent-scheduler-" + f.UniqueName
ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, schedulerName)) cleanupFunc := ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, schedulerName)
defer cleanupFunc()
// Verify that cluster size is the same // Verify that cluster size is the same
ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String())) ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String()))
sizeFunc := func(size int) bool { sizeFunc := func(size int) bool {