github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed flakiness in cluster size autoscaling e2e

Browse Source
This commit is contained in:
Piotr Szczesniak 2015-10-14 20:45:32 +02:00
parent 465c5b0791
commit 77d9ce230c
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/autoscaling_utils.go
View File

@ -63,22 +63,22 @@ type ResourceConsumer struct {
requestSizeInMegabytes int requestSizeInMegabytes int
} }
func NewDynamicResourceConsumer(name string, replicas, initCPU, initMemory int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer { func NewDynamicResourceConsumer(name string, replicas, initCPUTotal, initMemoryTotal int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer {
return newResourceConsumer(name, replicas, initCPU, initMemory, dynamicConsumptionTimeInSeconds, dynamicRequestSizeInMillicores, dynamicRequestSizeInMegabytes, cpuLimit, memLimit, framework) return newResourceConsumer(name, replicas, initCPUTotal, initMemoryTotal, dynamicConsumptionTimeInSeconds, dynamicRequestSizeInMillicores, dynamicRequestSizeInMegabytes, cpuLimit, memLimit, framework)
} }
func NewStaticResourceConsumer(name string, replicas, initCPU, initMemory int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer { func NewStaticResourceConsumer(name string, replicas, initCPUTotal, initMemoryTotal int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer {
return newResourceConsumer(name, replicas, initCPU, initMemory, staticConsumptionTimeInSeconds, initCPU/replicas, initMemory/replicas, cpuLimit, memLimit, framework) return newResourceConsumer(name, replicas, initCPUTotal, initMemoryTotal, staticConsumptionTimeInSeconds, initCPUTotal/replicas, initMemoryTotal/replicas, cpuLimit, memLimit, framework)
} }
/* /*
NewResourceConsumer creates new ResourceConsumer NewResourceConsumer creates new ResourceConsumer
initCPU argument is in millicores initCPUTotal argument is in millicores
initMemory argument is in megabytes initMemoryTotal argument is in megabytes
memLimit argument is in megabytes, memLimit is a maximum amount of memory that can be consumed by a single pod memLimit argument is in megabytes, memLimit is a maximum amount of memory that can be consumed by a single pod
cpuLimit argument is in millicores, cpuLimit is a maximum amount of cpu that can be consumed by a single pod cpuLimit argument is in millicores, cpuLimit is a maximum amount of cpu that can be consumed by a single pod
*/ */
func newResourceConsumer(name string, replicas, initCPU, initMemory, consumptionTimeInSeconds, requestSizeInMillicores, requestSizeInMegabytes int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer { func newResourceConsumer(name string, replicas, initCPUTotal, initMemoryTotal, consumptionTimeInSeconds, requestSizeInMillicores, requestSizeInMegabytes int, cpuLimit, memLimit int64, framework *Framework) *ResourceConsumer {
runServiceAndRCForResourceConsumer(framework.Client, framework.Namespace.Name, name, replicas, cpuLimit, memLimit) runServiceAndRCForResourceConsumer(framework.Client, framework.Namespace.Name, name, replicas, cpuLimit, memLimit)
rc := &ResourceConsumer{ rc := &ResourceConsumer{
name: name, name: name,
@ -93,9 +93,9 @@ func newResourceConsumer(name string, replicas, initCPU, initMemory, consumption
requestSizeInMegabytes: requestSizeInMegabytes, requestSizeInMegabytes: requestSizeInMegabytes,
} }
go rc.makeConsumeCPURequests() go rc.makeConsumeCPURequests()
rc.ConsumeCPU(initCPU) rc.ConsumeCPU(initCPUTotal)
go rc.makeConsumeMemRequests() go rc.makeConsumeMemRequests()
rc.ConsumeMem(initMemory) rc.ConsumeMem(initMemoryTotal)
return rc return rc
} }

28
test/e2e/autoscaling.go → test/e2e/cluster_size_autoscaling.go
View File

@ -61,11 +61,13 @@ var _ = Describe("Autoscaling", func() {
setUpAutoscaler("cpu/node_utilization", 0.4, nodeCount, nodeCount+1) setUpAutoscaler("cpu/node_utilization", 0.4, nodeCount, nodeCount+1)
// Consume 50% CPU // Consume 50% CPU
millicoresPerReplica := 500 rcs := createConsumingRCs(f, "cpu-utilization", nodeCount*coresPerNode, 500, 0)
rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f) err := waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) for _, rc := range rcs {
rc.CleanUp() rc.CleanUp()
}
expectNoError(err)
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
}) })
@ -84,10 +86,13 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% of total memory capacity // Consume 60% of total memory capacity
megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode) megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode)
rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f) rcs := createConsumingRCs(f, "mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) err := waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)
for _, rc := range rcs {
rc.CleanUp() rc.CleanUp()
}
expectNoError(err)
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
}) })
@ -116,6 +121,15 @@ func setUpAutoscaler(metric string, target float64, min, max int) {
expectNoError(err, "Output: "+string(out)) expectNoError(err, "Output: "+string(out))
} }
func createConsumingRCs(f *Framework, name string, count, cpuPerReplica, memPerReplica int) []*ResourceConsumer {
var res []*ResourceConsumer
for i := 1; i <= count; i++ {
name := fmt.Sprintf("%s-%d", name, i)
res = append(res, NewStaticResourceConsumer(name, 1, cpuPerReplica, memPerReplica, int64(cpuPerReplica), int64(memPerReplica+100), f))
}
return res
}
func cleanUpAutoscaler() { func cleanUpAutoscaler() {
By("Removing autoscaler") By("Removing autoscaler")
out, err := exec.Command("gcloud", "compute", "instance-groups", "managed", "stop-autoscaling", out, err := exec.Command("gcloud", "compute", "instance-groups", "managed", "stop-autoscaling",