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

Merge pull request #2434 from kolyshkin/cpu-quota-fix-minimal 

cgroupv1: minimal fix for cpu quota regression
This commit is contained in:
Akihiro Suda 2020-05-27 10:08:17 +09:00 committed by GitHub
parent 1f737eebaa be5467872d
commit a891fee8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libcontainer/cgroups/systemd/v1.go
View File

@ -4,7 +4,6 @@ package systemd
import ( import (
"errors" "errors"
"fmt"
"io/ioutil" "io/ioutil"
"math" "math"
"os" "os"
@ -90,18 +89,7 @@ func genV1ResourcesProperties(c *configs.Cgroup) ([]systemdDbus.Property, error)
} }
// cpu.cfs_quota_us and cpu.cfs_period_us are controlled by systemd. // cpu.cfs_quota_us and cpu.cfs_period_us are controlled by systemd.
if c.Resources.CpuQuota != 0 || c.Resources.CpuPeriod != 0 { if c.Resources.CpuQuota != 0 && c.Resources.CpuPeriod != 0 {
if c.Resources.CpuQuota < -1 {
return nil, fmt.Errorf("Invalid CPU quota value: %d", c.Resources.CpuQuota)
}
if c.Resources.CpuQuota != -1 {
if c.Resources.CpuQuota == 0 || c.Resources.CpuPeriod == 0 {
return nil, errors.New("CPU quota and period should both be set")
}
if c.Resources.CpuPeriod < 0 {
return nil, fmt.Errorf("Invalid CPU period value: %d", c.Resources.CpuPeriod)
}
}
// corresponds to USEC_INFINITY in systemd // corresponds to USEC_INFINITY in systemd
// if USEC_INFINITY is provided, CPUQuota is left unbound by systemd // if USEC_INFINITY is provided, CPUQuota is left unbound by systemd
// always setting a property value ensures we can apply a quota and remove it later // always setting a property value ensures we can apply a quota and remove it later

7
tests/integration/update.bats
View File

@ -281,6 +281,13 @@ EOF
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
check_cgroup_value "cpu.cfs_quota_us" 600000 check_cgroup_value "cpu.cfs_quota_us" 600000
else else
# update cpu quota
runc update test_update --cpu-quota 600000
[ "$status" -eq 0 ]
check_cgroup_value "cpu.cfs_quota_us" 600000
# this is currently broken
#check_systemd_value "CPUQuotaPerSecUSec" 600ms
# update cpu quota and period together # update cpu quota and period together
runc update test_update --cpu-period 900000 --cpu-quota 600000 runc update test_update --cpu-period 900000 --cpu-quota 600000
[ "$status" -eq 0 ] [ "$status" -eq 0 ]