mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #14644 from piosz/autoscaling-e2e
Added debug logs to autoscaling_utils.go
This commit is contained in:
		@@ -17,6 +17,7 @@ limitations under the License.
 | 
				
			|||||||
package e2e
 | 
					package e2e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"fmt"
 | 
				
			||||||
	"strconv"
 | 
						"strconv"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -100,11 +101,13 @@ func newResourceConsumer(name string, replicas, initCPU, initMemory, consumption
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// ConsumeCPU consumes given number of CPU
 | 
					// ConsumeCPU consumes given number of CPU
 | 
				
			||||||
func (rc *ResourceConsumer) ConsumeCPU(millicores int) {
 | 
					func (rc *ResourceConsumer) ConsumeCPU(millicores int) {
 | 
				
			||||||
 | 
						Logf("RC %s: consume %v millicores in total", rc.name, millicores)
 | 
				
			||||||
	rc.cpu <- millicores
 | 
						rc.cpu <- millicores
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ConsumeMem consumes given number of Mem
 | 
					// ConsumeMem consumes given number of Mem
 | 
				
			||||||
func (rc *ResourceConsumer) ConsumeMem(megabytes int) {
 | 
					func (rc *ResourceConsumer) ConsumeMem(megabytes int) {
 | 
				
			||||||
 | 
						Logf("RC %s: consume %v MB in total", rc.name, megabytes)
 | 
				
			||||||
	rc.mem <- megabytes
 | 
						rc.mem <- megabytes
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -116,11 +119,13 @@ func (rc *ResourceConsumer) makeConsumeCPURequests() {
 | 
				
			|||||||
	for {
 | 
						for {
 | 
				
			||||||
		select {
 | 
							select {
 | 
				
			||||||
		case millicores := <-rc.cpu:
 | 
							case millicores := <-rc.cpu:
 | 
				
			||||||
 | 
								Logf("RC %s: consume %v millicores in total", rc.name, millicores)
 | 
				
			||||||
			if rc.requestSizeInMillicores != 0 {
 | 
								if rc.requestSizeInMillicores != 0 {
 | 
				
			||||||
				count = millicores / rc.requestSizeInMillicores
 | 
									count = millicores / rc.requestSizeInMillicores
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			rest = millicores - count*rc.requestSizeInMillicores
 | 
								rest = millicores - count*rc.requestSizeInMillicores
 | 
				
			||||||
		case <-time.After(sleepTime):
 | 
							case <-time.After(sleepTime):
 | 
				
			||||||
 | 
								Logf("RC %s: sending %v requests to consume %v millicores each and 1 request to consume %v millicores", rc.name, count, rc.requestSizeInMillicores, rest)
 | 
				
			||||||
			if count > 0 {
 | 
								if count > 0 {
 | 
				
			||||||
				rc.sendConsumeCPURequests(count, rc.requestSizeInMillicores, rc.consumptionTimeInSeconds)
 | 
									rc.sendConsumeCPURequests(count, rc.requestSizeInMillicores, rc.consumptionTimeInSeconds)
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@@ -142,11 +147,13 @@ func (rc *ResourceConsumer) makeConsumeMemRequests() {
 | 
				
			|||||||
	for {
 | 
						for {
 | 
				
			||||||
		select {
 | 
							select {
 | 
				
			||||||
		case megabytes := <-rc.mem:
 | 
							case megabytes := <-rc.mem:
 | 
				
			||||||
 | 
								Logf("RC %s: consume %v MB in total", rc.name, megabytes)
 | 
				
			||||||
			if rc.requestSizeInMegabytes != 0 {
 | 
								if rc.requestSizeInMegabytes != 0 {
 | 
				
			||||||
				count = megabytes / rc.requestSizeInMegabytes
 | 
									count = megabytes / rc.requestSizeInMegabytes
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			rest = megabytes - count*rc.requestSizeInMegabytes
 | 
								rest = megabytes - count*rc.requestSizeInMegabytes
 | 
				
			||||||
		case <-time.After(sleepTime):
 | 
							case <-time.After(sleepTime):
 | 
				
			||||||
 | 
								Logf("RC %s: sending %v requests to consume %v MB each and 1 request to consume %v MB", rc.name, count, rc.requestSizeInMegabytes, rest)
 | 
				
			||||||
			if count > 0 {
 | 
								if count > 0 {
 | 
				
			||||||
				rc.sendConsumeMemRequests(count, rc.requestSizeInMegabytes, rc.consumptionTimeInSeconds)
 | 
									rc.sendConsumeMemRequests(count, rc.requestSizeInMegabytes, rc.consumptionTimeInSeconds)
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@@ -225,6 +232,7 @@ func (rc *ResourceConsumer) WaitForReplicas(desiredReplicas int) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (rc *ResourceConsumer) CleanUp() {
 | 
					func (rc *ResourceConsumer) CleanUp() {
 | 
				
			||||||
 | 
						By(fmt.Sprintf("Removing consuming RC %s", rc.name))
 | 
				
			||||||
	rc.stopCPU <- 0
 | 
						rc.stopCPU <- 0
 | 
				
			||||||
	rc.stopMem <- 0
 | 
						rc.stopMem <- 0
 | 
				
			||||||
	// Wait some time to ensure all child goroutines are finished.
 | 
						// Wait some time to ensure all child goroutines are finished.
 | 
				
			||||||
@@ -234,6 +242,7 @@ func (rc *ResourceConsumer) CleanUp() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, replicas int, cpuLimitMillis, memLimitMb int64) {
 | 
					func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, replicas int, cpuLimitMillis, memLimitMb int64) {
 | 
				
			||||||
 | 
						By(fmt.Sprintf("Running consuming RC %s with %v replicas", name, replicas))
 | 
				
			||||||
	_, err := c.Services(ns).Create(&api.Service{
 | 
						_, err := c.Services(ns).Create(&api.Service{
 | 
				
			||||||
		ObjectMeta: api.ObjectMeta{
 | 
							ObjectMeta: api.ObjectMeta{
 | 
				
			||||||
			Name: name,
 | 
								Name: name,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user