Merge pull request #13789 from socaa/resource-consumer-memory

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-09-10 08:49:42 -07:00
commit 08fbe2bc10
2 changed files with 11 additions and 4 deletions

View File

@ -104,8 +104,7 @@ func (handler ResourceConsumerHandler) handleConsumeMem(w http.ResponseWriter, q
http.Error(w, incorrectFunctionArgument, http.StatusBadRequest)
return
}
ConsumeMem(megabytes, durationSec)
fmt.Fprintln(w, "Warning: not implemented!")
go ConsumeMem(megabytes, durationSec)
fmt.Fprintln(w, consumeMemAddress[1:])
fmt.Fprintln(w, megabytes, megabytesQuery)
fmt.Fprintln(w, durationSec, durationSecQuery)

View File

@ -20,9 +20,13 @@ import (
"fmt"
"log"
"os/exec"
"strconv"
)
const consumeCPUBinary = "./consume-cpu/consume-cpu"
const (
consumeCPUBinary = "./consume-cpu/consume-cpu"
consumeMemBinary = "stress"
)
func ConsumeCPU(millicores int, durationSec int) {
log.Printf("ConsumeCPU millicores: %v, durationSec: %v", millicores, durationSec)
@ -35,7 +39,11 @@ func ConsumeCPU(millicores int, durationSec int) {
func ConsumeMem(megabytes int, durationSec int) {
log.Printf("ConsumeMem megabytes: %v, durationSec: %v", megabytes, durationSec)
// not implemented
megabytesString := strconv.Itoa(megabytes) + "M"
durationSecString := strconv.Itoa(durationSec)
// creating new consume memory process
consumeMem := exec.Command(consumeMemBinary, "-m", "1", "--vm-bytes", megabytesString, "--vm-hang", "0", "-t", durationSecString)
consumeMem.Start()
}
func GetCurrentStatus() {