Merge pull request #109231 from pbeschetnov/rc-logs

Only log requests for configured consumptions in ResourceConsumer
This commit is contained in:
Kubernetes Prow Robot 2022-05-04 13:02:19 -07:00 committed by GitHub
commit 4dacd5113d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -197,7 +197,6 @@ func newResourceConsumer(name, nsName string, kind schema.GroupVersionKind, repl
go rc.makeConsumeCPURequests() go rc.makeConsumeCPURequests()
rc.ConsumeCPU(initCPUTotal) rc.ConsumeCPU(initCPUTotal)
go rc.makeConsumeMemRequests() go rc.makeConsumeMemRequests()
rc.ConsumeMem(initMemoryTotal) rc.ConsumeMem(initMemoryTotal)
go rc.makeConsumeCustomMetric() go rc.makeConsumeCustomMetric()
@ -232,10 +231,16 @@ func (rc *ResourceConsumer) makeConsumeCPURequests() {
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) if millicores != 0 {
framework.Logf("RC %s: setting consumption to %v millicores in total", rc.name, millicores)
} else {
framework.Logf("RC %s: disabling CPU consumption", rc.name)
}
case <-tick: case <-tick:
framework.Logf("RC %s: sending request to consume %d millicores", rc.name, millicores) if millicores != 0 {
rc.sendConsumeCPURequest(millicores) framework.Logf("RC %s: sending request to consume %d millicores", rc.name, millicores)
rc.sendConsumeCPURequest(millicores)
}
tick = time.After(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)
@ -253,10 +258,16 @@ func (rc *ResourceConsumer) makeConsumeMemRequests() {
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) if megabytes != 0 {
framework.Logf("RC %s: setting consumption to %v MB in total", rc.name, megabytes)
} else {
framework.Logf("RC %s: disabling mem consumption", rc.name)
}
case <-tick: case <-tick:
framework.Logf("RC %s: sending request to consume %d MB", rc.name, megabytes) if megabytes != 0 {
rc.sendConsumeMemRequest(megabytes) framework.Logf("RC %s: sending request to consume %d MB", rc.name, megabytes)
rc.sendConsumeMemRequest(megabytes)
}
tick = time.After(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)
@ -274,10 +285,16 @@ func (rc *ResourceConsumer) makeConsumeCustomMetric() {
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) if delta != 0 {
framework.Logf("RC %s: setting bump of metric %s to %d in total", rc.name, customMetricName, delta)
} else {
framework.Logf("RC %s: disabling consumption of custom metric %s", rc.name, customMetricName)
}
case <-tick: case <-tick:
framework.Logf("RC %s: sending request to consume %d of custom metric %s", rc.name, delta, customMetricName) if delta != 0 {
rc.sendConsumeCustomMetric(delta) framework.Logf("RC %s: sending request to consume %d of custom metric %s", rc.name, delta, customMetricName)
rc.sendConsumeCustomMetric(delta)
}
tick = time.After(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)