mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #64392 from shyamjvs/fix-scheduler-throughput-metric
Automatic merge from submit-queue (batch tested with PRs 64392, 63885). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix bug with scheduler throughput variable pass-by-value Because I keep forgetting go slice semantics :p /cc @wojtek-t ```release-note NONE ```
This commit is contained in:
commit
ffd32fdc18
@ -227,7 +227,7 @@ func logPodStartupStatus(
|
||||
expectedPods int,
|
||||
observedLabels map[string]string,
|
||||
period time.Duration,
|
||||
scheduleThroughputs []float64,
|
||||
scheduleThroughputs *[]float64,
|
||||
stopCh chan struct{}) {
|
||||
|
||||
label := labels.SelectorFromSet(labels.Set(observedLabels))
|
||||
@ -250,14 +250,14 @@ func logPodStartupStatus(
|
||||
framework.Logf(startupStatus.String("Density"))
|
||||
// Compute scheduling throughput for the latest time period.
|
||||
throughput := float64(startupStatus.Scheduled-lastScheduledCount) / float64(period/time.Second)
|
||||
scheduleThroughputs = append(scheduleThroughputs, throughput)
|
||||
*scheduleThroughputs = append(*scheduleThroughputs, throughput)
|
||||
lastScheduledCount = startupStatus.Scheduled
|
||||
}
|
||||
}
|
||||
|
||||
// runDensityTest will perform a density test and return the time it took for
|
||||
// all pods to start
|
||||
func runDensityTest(dtc DensityTestConfig, testPhaseDurations *timer.TestPhaseTimer, scheduleThroughputs []float64) time.Duration {
|
||||
func runDensityTest(dtc DensityTestConfig, testPhaseDurations *timer.TestPhaseTimer, scheduleThroughputs *[]float64) time.Duration {
|
||||
defer GinkgoRecover()
|
||||
|
||||
// Create all secrets, configmaps and daemons.
|
||||
@ -647,7 +647,7 @@ var _ = SIGDescribe("Density", func() {
|
||||
LogFunc: framework.Logf,
|
||||
})
|
||||
}
|
||||
e2eStartupTime = runDensityTest(dConfig, testPhaseDurations, scheduleThroughputs)
|
||||
e2eStartupTime = runDensityTest(dConfig, testPhaseDurations, &scheduleThroughputs)
|
||||
if itArg.runLatencyTest {
|
||||
By("Scheduling additional Pods to measure startup latencies")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user