aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-26 02:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: delete cgroup for SandboxOnly option

Browse Source 
Use all subsystems for SandboxOnly option to make sure
all cgroups are deleted.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2019-08-26 18:21:43 -05:00
parent 3fc6f4bc55
commit 9fc7246e8a
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
virtcontainers/sandbox.go
View File

@@ -1907,21 +1907,37 @@ func (s *Sandbox) cgroupsUpdate() error {
func (s *Sandbox) cgroupsDelete() error {
s.Logger().Debug("Deleting sandbox cgroup")
if s.state.CgroupPath == "" {
s.Logger().Warnf("sandox cgroups path is empty")
return nil
}
path := cgroupNoConstraintsPath(s.state.CgroupPath)
s.Logger().WithField("path", path).Debug("Deleting no constraints cgroup")
noConstraintsCgroup, err := cgroupsLoadFunc(V1NoConstraints, cgroups.StaticPath(path))
var path string
cgroupSubystems := V1NoConstraints
if s.config.SandboxCgroupOnly {
// Override V1NoConstraints, if SandboxCgroupOnly is enabled
cgroupSubystems = cgroups.V1
path = s.state.CgroupPath
s.Logger().WithField("path", path).Debug("Deleting sandbox cgroups (all subsystems)")
} else {
path = cgroupNoConstraintsPath(s.state.CgroupPath)
s.Logger().WithField("path", path).Debug("Deleting no constraints cgroup")
}
sandboxCgroups, err := cgroupsLoadFunc(cgroupSubystems, cgroups.StaticPath(path))
if err == cgroups.ErrCgroupDeleted {
// cgroup already deleted
s.Logger().Warnf("cgroup already deleted: '%s'", err)
return nil
}
if err != nil {
return fmt.Errorf("Could not load cgroup without constraints %v: %v", path, err)
return fmt.Errorf("Could not load cgroups %v: %v", path, err)
}
// move running process here, that way cgroup can be removed
parent, err := parentCgroup(V1NoConstraints, path)
parent, err := parentCgroup(cgroupSubystems, path)
if err != nil {
// parent cgroup doesn't exist, that means there are no process running
// and the no constraints cgroup was removed.
@@ -1929,12 +1945,12 @@ func (s *Sandbox) cgroupsDelete() error {
return nil
}
if err := noConstraintsCgroup.MoveTo(parent); err != nil {
if err := sandboxCgroups.MoveTo(parent); err != nil {
// Don't fail, cgroup can be deleted
s.Logger().WithError(err).Warn("Could not move process from no constraints to parent cgroup")
s.Logger().WithError(err).Warnf("Could not move process from %s to parent cgroup", path)
}
return noConstraintsCgroup.Delete()
return sandboxCgroups.Delete()
}
func (s *Sandbox) constrainHypervisorVCPUs(cgroup cgroups.Cgroup) error {