mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2210 from Zyqsempai/2164-remove-deprecated-systemd-resources

Browse Source 
Exchange deprecated systemd resources with the appropriate for cgroupv2
This commit is contained in:
Qiang Huang
2020-02-29 10:13:55 +08:00
committed by GitHub
parent 688cf6d43c 5b96f314ba
commit 3b7e32feba
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/cgroups/systemd/unified_hierarchy.go
+4 -9
View File
@@ -81,7 +81,7 @@ func (m *UnifiedManager) Apply(pid int) error {
properties = append(properties,
newProp("MemoryAccounting", true),
newProp("CPUAccounting", true),
newProp("BlockIOAccounting", true))
newProp("IOAccounting", true))
// Assume DefaultDependencies= will always work (the check for it was previously broken.)
properties = append(properties,
@@ -89,12 +89,12 @@ func (m *UnifiedManager) Apply(pid int) error {
if c.Resources.Memory != 0 {
properties = append(properties,
newProp("MemoryLimit", uint64(c.Resources.Memory)))
newProp("MemoryMax", uint64(c.Resources.Memory)))
}
if c.Resources.CpuShares != 0 {
if c.Resources.CpuWeight != 0 {
properties = append(properties,
newProp("CPUShares", c.Resources.CpuShares))
newProp("CPUWeight", c.Resources.CpuWeight))
}
// cpu.cfs_quota_us and cpu.cfs_period_us are controlled by systemd.
@@ -117,11 +117,6 @@ func (m *UnifiedManager) Apply(pid int) error {
newProp("CPUQuotaPerSecUSec", cpuQuotaPerSecUSec))
}
if c.Resources.BlkioWeight != 0 {
properties = append(properties,
newProp("BlockIOWeight", uint64(c.Resources.BlkioWeight)))
}
if c.Resources.PidsLimit > 0 {
properties = append(properties,
newProp("TasksAccounting", true),