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 2f7f6deef7.

/cc @wojtek-t 

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-28 08:34:01 -07:00 committed by GitHub
commit 42295cf99e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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.
// However, this can be overridden by LOAD_TEST_THROUGHPUT env var.
throughput := 20
throughput := 10
if throughputEnv := os.Getenv("LOAD_TEST_THROUGHPUT"); throughputEnv != "" {
if newThroughput, err := strconv.Atoi(throughputEnv); err == nil {
throughput = newThroughput
@ -329,10 +329,9 @@ var _ = SIGDescribe("Load capacity", func() {
By("============================================================================")
// Cleanup all created replication controllers.
// Currently we assume <throughput/2> pods/second average deletion throughput,
// as GC is rate-limited and needs to make 2 calls per pod deletion.
// Currently we assume <throughput> pods/second average deletion throughput.
// 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)
deleteAllResources(configs, deletingTime, testPhaseDurations.StartPhase(500, "load pods deletion"))
})