From 115092b374f79c9973e0028605cb5a8fa27e0de4 Mon Sep 17 00:00:00 2001 From: zhifei92 Date: Wed, 3 Jul 2024 21:14:01 +0800 Subject: [PATCH] fix(e2e_node): density cleanup pods --- test/e2e_node/density_test.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 16d0f036d74..253718993c7 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -354,10 +354,13 @@ func runDensityBatchTest(ctx context.Context, f *framework.Framework, rc *Resour time.Sleep(sleepBeforeCreatePods) rc.Start() + ginkgo.DeferCleanup(rc.Stop) ginkgo.By("Creating a batch of pods") // It returns a map['pod name']'creation time' containing the creation timestamps createTimes := createBatchPodWithRateControl(ctx, f, pods, testArg.interval) + ginkgo.DeferCleanup(deletePodsSync, f, pods) + ginkgo.DeferCleanup(deletePodsSync, f, []*v1.Pod{getCadvisorPod()}) ginkgo.By("Waiting for all Pods to be observed by the watch...") @@ -400,9 +403,6 @@ func runDensityBatchTest(ctx context.Context, f *framework.Framework, rc *Resour sort.Sort(e2emetrics.LatencySlice(e2eLags)) batchLag := lastRunning.Time.Sub(firstCreate.Time) - rc.Stop() - deletePodsSync(ctx, f, pods) - // Log time series data. if isLogTimeSeries { logDensityTimeSeries(rc, createTimes, watchTimes, testInfo) @@ -410,8 +410,6 @@ func runDensityBatchTest(ctx context.Context, f *framework.Framework, rc *Resour // Log throughput data. logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testInfo) - deletePodsSync(ctx, f, []*v1.Pod{getCadvisorPod()}) - return batchLag, e2eLags } @@ -428,22 +426,21 @@ func runDensitySeqTest(ctx context.Context, f *framework.Framework, rc *Resource // CreatBatch is synchronized, all pods are running when it returns e2epod.NewPodClient(f).CreateBatch(ctx, bgPods) + ginkgo.DeferCleanup(deletePodsSync, f, bgPods) + ginkgo.DeferCleanup(deletePodsSync, f, []*v1.Pod{getCadvisorPod()}) time.Sleep(sleepBeforeCreatePods) rc.Start() + ginkgo.DeferCleanup(rc.Stop) // Create pods sequentially (back-to-back). e2eLags have been sorted. batchlag, e2eLags := createBatchPodSequential(ctx, f, testPods, podType) - - rc.Stop() - deletePodsSync(ctx, f, append(bgPods, testPods...)) + ginkgo.DeferCleanup(deletePodsSync, f, testPods) // Log throughput data. logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testInfo) - deletePodsSync(ctx, f, []*v1.Pod{getCadvisorPod()}) - return batchlag, e2eLags }