jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #857 from hqhq/improve_update_memory 

Improve update memory
This commit is contained in:
Mrunal Patel 2016-06-01 13:20:02 -07:00
parent 9e0c1e7bb9 71511dc155
commit e7b8d1903a
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/update.bats
View File

@ -103,6 +103,11 @@ function check_cgroup_value() {
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
check_cgroup_value $CGROUP_MEMORY "memory.limit_in_bytes" 67108864 check_cgroup_value $CGROUP_MEMORY "memory.limit_in_bytes" 67108864
runc update test_update --memory 50M
[ "$status" -eq 0 ]
check_cgroup_value $CGROUP_MEMORY "memory.limit_in_bytes" 52428800
# update memory soft limit # update memory soft limit
runc update test_update --memory-reservation 33554432 runc update test_update --memory-reservation 33554432
[ "$status" -eq 0 ] [ "$status" -eq 0 ]

28
update.go
View File

@ -9,6 +9,7 @@ import (
"strconv" "strconv"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/docker/go-units"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
@ -155,14 +156,9 @@ other options are ignored.
} }
for opt, dest := range map[string]*uint64{ for opt, dest := range map[string]*uint64{
"cpu-period": r.CPU.Period, "cpu-period": r.CPU.Period,
"cpu-quota": r.CPU.Quota, "cpu-quota": r.CPU.Quota,
"cpu-share": r.CPU.Shares, "cpu-share": r.CPU.Shares,
"kernel-memory": r.Memory.Kernel,
"kernel-memory-tcp": r.Memory.KernelTCP,
"memory": r.Memory.Limit,
"memory-reservation": r.Memory.Reservation,
"memory-swap": r.Memory.Swap,
} { } {
if val := context.String(opt); val != "" { if val := context.String(opt); val != "" {
var err error var err error
@ -172,6 +168,22 @@ other options are ignored.
} }
} }
} }
for opt, dest := range map[string]*uint64{
"kernel-memory": r.Memory.Kernel,
"kernel-memory-tcp": r.Memory.KernelTCP,
"memory": r.Memory.Limit,
"memory-reservation": r.Memory.Reservation,
"memory-swap": r.Memory.Swap,
} {
if val := context.String(opt); val != "" {
v, err := units.RAMInBytes(val)
if err != nil {
return fmt.Errorf("invalid value for %s: %s", opt, err)
}
*dest = uint64(v)
}
}
} }
// Update the value // Update the value