mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #40934 from dashpole/density_test_cadvisor
Automatic merge from submit-queue delete cadvisor pod after test tracing looks at events for pod deletion and volume teardown. SInce the cadvisor pod has more than 1 volume, this can make results harder to analyze. This PR moves the deletion of the cadvisor pod to after the logPodCreateThroughput call, since that marks the "end" of the test. cc: @dchen1107 @Random-Liu
This commit is contained in:
commit
4ac7fd9d19
@ -385,7 +385,7 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg
|
||||
batchLag := lastRunning.Time.Sub(firstCreate.Time)
|
||||
|
||||
rc.Stop()
|
||||
deletePodsSync(f, append(pods, getCadvisorPod()))
|
||||
deletePodsSync(f, pods)
|
||||
|
||||
// Log time series data.
|
||||
if isLogTimeSeries {
|
||||
@ -394,6 +394,8 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg
|
||||
// Log throughput data.
|
||||
logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testInfo)
|
||||
|
||||
deletePodsSync(f, []*v1.Pod{getCadvisorPod()})
|
||||
|
||||
return batchLag, e2eLags
|
||||
}
|
||||
|
||||
@ -419,11 +421,13 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de
|
||||
batchlag, e2eLags := createBatchPodSequential(f, testPods)
|
||||
|
||||
rc.Stop()
|
||||
deletePodsSync(f, append(bgPods, append(testPods, getCadvisorPod())...))
|
||||
deletePodsSync(f, append(bgPods, testPods...))
|
||||
|
||||
// Log throughput data.
|
||||
logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testInfo)
|
||||
|
||||
deletePodsSync(f, []*v1.Pod{getCadvisorPod()})
|
||||
|
||||
return batchlag, e2eLags
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user