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

Merge pull request #1344 from xuxinkun/fixCPUQuota20170224 

fix cpu.cfs_quota_us changed when systemd daemon-reload using systemd.
This commit is contained in:
Michael Crosby 2017-03-06 10:02:28 -08:00 committed by GitHub
parent 291bf60110 c44aec9b23
commit 49a33c41f8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -269,6 +269,13 @@ func (m *Manager) Apply(pid int) error {
newProp("CPUShares", uint64(c.Resources.CpuShares))) newProp("CPUShares", uint64(c.Resources.CpuShares)))
} }
// cpu.cfs_quota_us and cpu.cfs_period_us are controlled by systemd.
if c.Resources.CpuQuota != 0 && c.Resources.CpuPeriod != 0 {
cpuQuotaPerSecUSec := c.Resources.CpuQuota * 1000000 / c.Resources.CpuPeriod
properties = append(properties,
newProp("CPUQuotaPerSecUSec", uint64(cpuQuotaPerSecUSec)))
}
if c.Resources.BlkioWeight != 0 { if c.Resources.BlkioWeight != 0 {
properties = append(properties, properties = append(properties,
newProp("BlockIOWeight", uint64(c.Resources.BlkioWeight))) newProp("BlockIOWeight", uint64(c.Resources.BlkioWeight)))