vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

libcontainer: Initial version of cgroups support

Browse source 
This is a minimal version of raw cgroup support for libcontainer.
It has only enough for what docker needs, and it has no support
for systemd yet.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
This commit is contained in:
Alexander Larsson 2014-02-20 23:12:08 +01:00 • committed by Michael Crosby
parent 8590435fa0
commit 3de41b34a2
6 changed files with 218 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libcontainer/nsinit/exec.go
View file

@ -5,6 +5,7 @@ package main
import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroup"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/libcontainer/utils"
"github.com/dotcloud/docker/pkg/system"
@ -33,10 +34,18 @@ func execCommand(container *libcontainer.Container, args []string) (int, error)
return -1, err
}
if err := writePidFile(command); err != nil {
command.Process.Kill()
return -1, err
}
defer deletePidFile()
// Do this before syncing with child so that no children
// can escape the cgroup
if err := cgroup.ApplyCgroup(container, command.Process.Pid); err != nil {
command.Process.Kill()
return -1, err
}
if container.Network != nil {
vethPair, err := initializeContainerVeth(container.Network.Bridge, command.Process.Pid)
if err != nil {
@ -45,6 +54,9 @@ func execCommand(container *libcontainer.Container, args []string) (int, error)
sendVethName(vethPair, inPipe)
}
// Sync with child
inPipe.Close()
go io.Copy(os.Stdout, master)
go io.Copy(master, os.Stdin)
@ -67,7 +79,6 @@ func execCommand(container *libcontainer.Container, args []string) (int, error)
// pipe so that the child stops waiting for more data
func sendVethName(name string, pipe io.WriteCloser) {
fmt.Fprint(pipe, name)
pipe.Close()
}
// initializeContainerVeth will create a veth pair and setup the host's