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

Run conmon under cgroups (systemd)

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-03-06 15:08:46 -08:00
parent 3195f45904
commit 8c0ff7d904
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/sandbox_run.go
View file

@ -43,8 +43,8 @@ func (s *Server) privilegedSandbox(req *pb.RunPodSandboxRequest) bool {
return false
}
func (s *Server) runContainer(container *oci.Container) error {
if err := s.runtime.CreateContainer(container); err != nil {
func (s *Server) runContainer(container *oci.Container, cgroupParent string) error {
if err := s.runtime.CreateContainer(container, cgroupParent); err != nil {
return err
}
@ -389,7 +389,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
}
}
if err = s.runContainer(container); err != nil {
if err = s.runContainer(container, sb.cgroupParent); err != nil {
return nil, err
}