Skip to content

K
k3s
Unverified Commit 42295cf9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67942 from shyamjvs/revert-load-test-throughput-change

Automatic merge from submit-queue (batch tested with PRs 67942, 67893). 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>. Revert "Re-calibrate load test throughputs" This reverts commit 2f7f6dee. /cc @wojtek-t ```release-note NONE ```
parents 9edf196c e062e639
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
test/e2e/scalability/load.go
View file @ 42295cf9
...@@ -121,10 +121,10 @@ var _ = SIGDescribe("Load capacity", func() { ...@@ -121,10 +121,10 @@ var _ = SIGDescribe("Load capacity", func() {
} }
}) })
// We assume a default throughput of 20 pods/second throughput. // We assume a default throughput of 10 pods/second throughput.
// We may want to revisit it in the future. // We may want to revisit it in the future.
// However, this can be overridden by LOAD_TEST_THROUGHPUT env var. // However, this can be overridden by LOAD_TEST_THROUGHPUT env var.
throughput := 20 throughput := 10
if throughputEnv := os.Getenv("LOAD_TEST_THROUGHPUT"); throughputEnv != "" { if throughputEnv := os.Getenv("LOAD_TEST_THROUGHPUT"); throughputEnv != "" {
if newThroughput, err := strconv.Atoi(throughputEnv); err == nil { if newThroughput, err := strconv.Atoi(throughputEnv); err == nil {
throughput = newThroughput throughput = newThroughput
...@@ -329,10 +329,9 @@ var _ = SIGDescribe("Load capacity", func() { ...@@ -329,10 +329,9 @@ var _ = SIGDescribe("Load capacity", func() {
By("============================================================================") By("============================================================================")
// Cleanup all created replication controllers. // Cleanup all created replication controllers.
// Currently we assume <throughput/2> pods/second average deletion throughput, // Currently we assume <throughput> pods/second average deletion throughput.
// as GC is rate-limited and needs to make 2 calls per pod deletion.
// We may want to revisit it in the future. // We may want to revisit it in the future.
deletingTime := time.Duration(totalPods/(throughput/2)) * time.Second deletingTime := time.Duration(totalPods/throughput) * time.Second
framework.Logf("Starting to delete %v objects...", itArg.kind) framework.Logf("Starting to delete %v objects...", itArg.kind)
deleteAllResources(configs, deletingTime, testPhaseDurations.StartPhase(500, "load pods deletion")) deleteAllResources(configs, deletingTime, testPhaseDurations.StartPhase(500, "load pods deletion"))
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment