vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #384 from mrunalp/fix_cgroup_parent

Browse source 
Fix cgroup parent
This commit is contained in:
Antonio Murdaca 2017-03-04 10:20:29 +01:00 committed by GitHub
commit 4589048b18
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/sandbox_run.go
View file

@ -264,11 +264,11 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
cgroupParent := req.GetConfig().GetLinux().CgroupParent cgroupParent := req.GetConfig().GetLinux().CgroupParent
if cgroupParent != "" { if cgroupParent != "" {
if s.config.CgroupManager == "systemd" { if s.config.CgroupManager == "systemd" {
cgPath := sb.cgroupParent + ":" + "ocid" + ":" + id cgPath := cgroupParent + ":" + "ocid" + ":" + id
g.SetLinuxCgroupsPath(cgPath) g.SetLinuxCgroupsPath(cgPath)
} else { } else {
g.SetLinuxCgroupsPath(sb.cgroupParent + "/" + id) g.SetLinuxCgroupsPath(cgroupParent + "/" + id)
} }
sb.cgroupParent = cgroupParent sb.cgroupParent = cgroupParent