Skip to content

Commit

Permalink
runc update: support unified resources
Browse files Browse the repository at this point in the history
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
  • Loading branch information
kolyshkin committed Nov 4, 2020
1 parent 0eb3112 commit 0975020
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
25 changes: 25 additions & 0 deletions tests/integration/update.bats
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,31 @@ EOF
check_cpu_quota 30000 100000 "300ms"
}

@test "update cgroup v2 resources via unified map" {
[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
requires cgroups_v2

runc run -d --console-socket "$CONSOLE_SOCKET" test_update
[ "$status" -eq 0 ]

# check that initial values were properly set
check_cpu_quota 500000 1000000 "500ms"
check_systemd_value "TasksMax" 20

runc update -r - test_update <<EOF
{
"unified": {
"cpu.max": "max 100000",
"pids.max": "10"
}
}
EOF

# check the updated systemd unit properties
check_cpu_quota -1 100000 "infinity"
check_systemd_value "TasksMax" 10
}

@test "update rt period and runtime" {
[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
requires cgroups_v1 cgroups_rt no_systemd
Expand Down
1 change: 1 addition & 0 deletions update.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ other options are ignored.
config.Cgroups.Resources.MemoryReservation = *r.Memory.Reservation
config.Cgroups.Resources.MemorySwap = *r.Memory.Swap
config.Cgroups.Resources.PidsLimit = r.Pids.Limit
config.Cgroups.Resources.Unified = r.Unified

// Update Intel RDT
l3CacheSchema := context.String("l3-cache-schema")
Expand Down

0 comments on commit 0975020

Please sign in to comment.