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

virtcontainers: cgroups: Define a cgroup interface

Browse Source 
And move the current, Linux-specific implementation into
cgroups_linux.go

Signed-off-by: Samuel Ortiz <s.ortiz@apple.com>
This commit is contained in:
Samuel Ortiz
2021-11-15 07:50:03 +01:00
committed by Samuel Ortiz
parent 6a9e5f90f7
commit d49d0b6f39
5 changed files with 351 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/runtime/virtcontainers/sandbox.go
View File

@@ -199,8 +199,8 @@ type Sandbox struct {
config *SandboxConfig
annotationsLock *sync.RWMutex
wg *sync.WaitGroup
sandboxCgroup *cgroups.Cgroup
overheadCgroup *cgroups.Cgroup
sandboxCgroup cgroups.Cgroup
overheadCgroup cgroups.Cgroup
cw *consoleWatcher
containers map[string]*Container
@@ -1752,9 +1752,11 @@ func (s *Sandbox) HotplugAddDevice(ctx context.Context, device api.Device, devTy
span, ctx := katatrace.Trace(ctx, s.Logger(), "HotplugAddDevice", sandboxTracingTags, map[string]string{"sandbox_id": s.id})
defer span.End()
if err := s.sandboxCgroup.AddDevice(device.GetHostPath()); err != nil {
s.Logger().WithError(err).WithField("device", device).
Warn("Could not add device to cgroup")
if s.sandboxCgroup != nil {
if err := s.sandboxCgroup.AddDevice(device.GetHostPath()); err != nil {
s.Logger().WithError(err).WithField("device", device).
Warn("Could not add device to cgroup")
}
}
switch devType {
@@ -1801,10 +1803,12 @@ func (s *Sandbox) HotplugAddDevice(ctx context.Context, device api.Device, devTy
// HotplugRemoveDevice is used for removing a device from sandbox
// Sandbox implement DeviceReceiver interface from device/api/interface.go
func (s *Sandbox) HotplugRemoveDevice(ctx context.Context, device api.Device, devType config.DeviceType) error {
defer func() {
if err := s.sandboxCgroup.RemoveDevice(device.GetHostPath()); err != nil {
s.Logger().WithError(err).WithField("device", device).
Warn("Could not add device to cgroup")
defer func() {
if s.sandboxCgroup != nil {
if err := s.sandboxCgroup.RemoveDevice(device.GetHostPath()); err != nil {
s.Logger().WithError(err).WithField("device", device).
Warn("Could not add device to cgroup")
}
}
}()
@@ -2127,7 +2131,7 @@ func (s *Sandbox) cgroupsDelete() error {
return nil
}
sandboxCgroup, err := cgroups.Load(s.state.SandboxCgroupPath)
sandboxCgroup, err := cgroups.LoadCgroup(s.state.SandboxCgroupPath)
if err != nil {
return err
}
@@ -2141,7 +2145,7 @@ func (s *Sandbox) cgroupsDelete() error {
}
if s.state.OverheadCgroupPath != "" {
overheadCgroup, err := cgroups.Load(s.state.OverheadCgroupPath)
overheadCgroup, err := cgroups.LoadCgroup(s.state.OverheadCgroupPath)
if err != nil {
return err
}