github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108104 from pbetkier/autoscaling-e2e-resource-consumer-fix

Browse Source 
e2e: Fix ResourceConsumer unstable request interval
This commit is contained in:
Kubernetes Prow Robot 2022-02-23 11:45:57 -08:00 committed by GitHub
commit 6d1c9a98ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/framework/autoscaling/autoscaling_utils.go
View File

@ -227,16 +227,16 @@ func (rc *ResourceConsumer) makeConsumeCPURequests() {
defer ginkgo.GinkgoRecover() defer ginkgo.GinkgoRecover()
rc.stopWaitGroup.Add(1) rc.stopWaitGroup.Add(1)
defer rc.stopWaitGroup.Done() defer rc.stopWaitGroup.Done()
sleepTime := time.Duration(0) tick := time.After(time.Duration(0))
millicores := 0 millicores := 0
for { for {
select { select {
case millicores = <-rc.cpu: case millicores = <-rc.cpu:
framework.Logf("RC %s: setting consumption to %v millicores in total", rc.name, millicores) framework.Logf("RC %s: setting consumption to %v millicores in total", rc.name, millicores)
case <-time.After(sleepTime): case <-tick:
framework.Logf("RC %s: sending request to consume %d millicores", rc.name, millicores) framework.Logf("RC %s: sending request to consume %d millicores", rc.name, millicores)
rc.sendConsumeCPURequest(millicores) rc.sendConsumeCPURequest(millicores)
sleepTime = rc.sleepTime tick = time.After(rc.sleepTime)
case <-rc.stopCPU: case <-rc.stopCPU:
framework.Logf("RC %s: stopping CPU consumer", rc.name) framework.Logf("RC %s: stopping CPU consumer", rc.name)
return return
@ -248,16 +248,16 @@ func (rc *ResourceConsumer) makeConsumeMemRequests() {
defer ginkgo.GinkgoRecover() defer ginkgo.GinkgoRecover()
rc.stopWaitGroup.Add(1) rc.stopWaitGroup.Add(1)
defer rc.stopWaitGroup.Done() defer rc.stopWaitGroup.Done()
sleepTime := time.Duration(0) tick := time.After(time.Duration(0))
megabytes := 0 megabytes := 0
for { for {
select { select {
case megabytes = <-rc.mem: case megabytes = <-rc.mem:
framework.Logf("RC %s: setting consumption to %v MB in total", rc.name, megabytes) framework.Logf("RC %s: setting consumption to %v MB in total", rc.name, megabytes)
case <-time.After(sleepTime): case <-tick:
framework.Logf("RC %s: sending request to consume %d MB", rc.name, megabytes) framework.Logf("RC %s: sending request to consume %d MB", rc.name, megabytes)
rc.sendConsumeMemRequest(megabytes) rc.sendConsumeMemRequest(megabytes)
sleepTime = rc.sleepTime tick = time.After(rc.sleepTime)
case <-rc.stopMem: case <-rc.stopMem:
framework.Logf("RC %s: stopping mem consumer", rc.name) framework.Logf("RC %s: stopping mem consumer", rc.name)
return return
@ -269,16 +269,16 @@ func (rc *ResourceConsumer) makeConsumeCustomMetric() {
defer ginkgo.GinkgoRecover() defer ginkgo.GinkgoRecover()
rc.stopWaitGroup.Add(1) rc.stopWaitGroup.Add(1)
defer rc.stopWaitGroup.Done() defer rc.stopWaitGroup.Done()
sleepTime := time.Duration(0) tick := time.After(time.Duration(0))
delta := 0 delta := 0
for { for {
select { select {
case delta = <-rc.customMetric: case delta = <-rc.customMetric:
framework.Logf("RC %s: setting bump of metric %s to %d in total", rc.name, customMetricName, delta) framework.Logf("RC %s: setting bump of metric %s to %d in total", rc.name, customMetricName, delta)
case <-time.After(sleepTime): case <-tick:
framework.Logf("RC %s: sending request to consume %d of custom metric %s", rc.name, delta, customMetricName) framework.Logf("RC %s: sending request to consume %d of custom metric %s", rc.name, delta, customMetricName)
rc.sendConsumeCustomMetric(delta) rc.sendConsumeCustomMetric(delta)
sleepTime = rc.sleepTime tick = time.After(rc.sleepTime)
case <-rc.stopCustomMetric: case <-rc.stopCustomMetric:
framework.Logf("RC %s: stopping metric consumer", rc.name) framework.Logf("RC %s: stopping metric consumer", rc.name)
return return