github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typo for milicores to millicores

pull/6/head
derekwaynecarr 2015-09-08 14:12:08 -04:00
parent 61a66a95a6
commit b05c11edac
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/autoscaling_utils.go
View File

@ -54,7 +54,7 @@ type ResourceConsumer struct {
} }
// NewResourceConsumer creates new ResourceConsumer // NewResourceConsumer creates new ResourceConsumer
// cpu argument is in milicores // cpu argument is in millicores
func NewResourceConsumer(name string, replicas int, cpu int, framework *Framework) *ResourceConsumer { func NewResourceConsumer(name string, replicas int, cpu int, framework *Framework) *ResourceConsumer {
runServiceAndRCForResourceConsumer(framework.Client, framework.Namespace.Name, name, replicas) runServiceAndRCForResourceConsumer(framework.Client, framework.Namespace.Name, name, replicas)
rc := &ResourceConsumer{ rc := &ResourceConsumer{
@ -69,8 +69,8 @@ func NewResourceConsumer(name string, replicas int, cpu int, framework *Framewor
} }
// ConsumeCPU consumes given number of CPU // ConsumeCPU consumes given number of CPU
func (rc *ResourceConsumer) ConsumeCPU(milicores int) { func (rc *ResourceConsumer) ConsumeCPU(millicores int) {
rc.channel <- milicores rc.channel <- millicores
} }
func (rc *ResourceConsumer) makeConsumeCPURequests() { func (rc *ResourceConsumer) makeConsumeCPURequests() {
@ -79,9 +79,9 @@ func (rc *ResourceConsumer) makeConsumeCPURequests() {
var rest int var rest int
for { for {
select { select {
case milicores := <-rc.channel: case millicores := <-rc.channel:
count = milicores / requestSizeInMilicores count = millicores / requestSizeInMilicores
rest = milicores - count*requestSizeInMilicores rest = millicores - count*requestSizeInMilicores
case <-time.After(sleepTime): case <-time.After(sleepTime):
if count > 0 { if count > 0 {
rc.sendConsumeCPUrequests(count, requestSizeInMilicores, consumptionTimeInSeconds) rc.sendConsumeCPUrequests(count, requestSizeInMilicores, consumptionTimeInSeconds)
@ -95,21 +95,21 @@ func (rc *ResourceConsumer) makeConsumeCPURequests() {
} }
} }
func (rc *ResourceConsumer) sendConsumeCPUrequests(requests, milicores, durationSec int) { func (rc *ResourceConsumer) sendConsumeCPUrequests(requests, millicores, durationSec int) {
for i := 0; i < requests; i++ { for i := 0; i < requests; i++ {
go rc.sendOneConsumeCPUrequest(milicores, durationSec) go rc.sendOneConsumeCPUrequest(millicores, durationSec)
} }
} }
// sendOneConsumeCPUrequest sends POST request for cpu consumption // sendOneConsumeCPUrequest sends POST request for cpu consumption
func (rc *ResourceConsumer) sendOneConsumeCPUrequest(milicores int, durationSec int) { func (rc *ResourceConsumer) sendOneConsumeCPUrequest(millicores int, durationSec int) {
_, err := rc.framework.Client.Post(). _, err := rc.framework.Client.Post().
Prefix("proxy"). Prefix("proxy").
Namespace(rc.framework.Namespace.Name). Namespace(rc.framework.Namespace.Name).
Resource("services"). Resource("services").
Name(rc.name). Name(rc.name).
Suffix("ConsumeCPU"). Suffix("ConsumeCPU").
Param("milicores", strconv.Itoa(milicores)). Param("millicores", strconv.Itoa(millicores)).
Param("durationSec", strconv.Itoa(durationSec)). Param("durationSec", strconv.Itoa(durationSec)).
Do(). Do().
Raw() Raw()

8
test/images/resource-consumer/consume-cpu/consume_cpu.go
View File

@ -34,20 +34,20 @@ func doSomething() {
} }
var ( var (
milicores = flag.Int("milicores", 0, "milicores number") millicores = flag.Int("millicores", 0, "millicores number")
durationSec = flag.Int("duration-sec", 0, "duration time in seconds") durationSec = flag.Int("duration-sec", 0, "duration time in seconds")
) )
func main() { func main() {
flag.Parse() flag.Parse()
// converte milicores to percentage // convert millicores to percentage
milicoresPct := float64(*milicores) / float64(10) millicoresPct := float64(*millicores) / float64(10)
duration := time.Duration(*durationSec) * time.Second duration := time.Duration(*durationSec) * time.Second
start := time.Now() start := time.Now()
first := systemstat.GetProcCPUSample() first := systemstat.GetProcCPUSample()
for time.Now().Sub(start) < duration { for time.Now().Sub(start) < duration {
cpu := systemstat.GetProcCPUAverage(first, systemstat.GetProcCPUSample(), systemstat.GetUptime().Uptime) cpu := systemstat.GetProcCPUAverage(first, systemstat.GetProcCPUSample(), systemstat.GetUptime().Uptime)
if cpu.TotalPct < milicoresPct { if cpu.TotalPct < millicoresPct {
doSomething() doSomething()
} else { } else {
time.Sleep(sleep) time.Sleep(sleep)

6
test/images/resource-consumer/utils.go
View File

@ -24,10 +24,10 @@ import (
const consumeCPUBinary = "./consume-cpu/consume-cpu" const consumeCPUBinary = "./consume-cpu/consume-cpu"
func ConsumeCPU(milicores int, durationSec int) { func ConsumeCPU(millicores int, durationSec int) {
log.Printf("ConsumeCPU milicores: %v, durationSec: %v", milicores, durationSec) log.Printf("ConsumeCPU millicores: %v, durationSec: %v", millicores, durationSec)
// creating new consume cpu process // creating new consume cpu process
arg1 := fmt.Sprintf("-milicores=%d", milicores) arg1 := fmt.Sprintf("-millicores=%d", millicores)
arg2 := fmt.Sprintf("-duration-sec=%d", durationSec) arg2 := fmt.Sprintf("-duration-sec=%d", durationSec)
consumeCPU := exec.Command(consumeCPUBinary, arg1, arg2) consumeCPU := exec.Command(consumeCPUBinary, arg1, arg2)
consumeCPU.Start() consumeCPU.Start()