kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Move container.json and pid file into a root specific driver dir

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-25 12:41:31 -08:00
parent ca42758368
commit 96e33a7646
8 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
execdriver/driver.go
View file

@ -53,6 +53,7 @@ type InitArgs struct {
Driver string
Console string
Pipe int
Root string
}
// Driver specific information based on

38
execdriver/native/driver.go
View file

@ -25,9 +25,9 @@ func init() {
execdriver.RegisterInitFunc(DriverName, func(args *execdriver.InitArgs) error {
var (
container *libcontainer.Container
ns = nsinit.NewNsInit(&nsinit.DefaultCommandFactory{}, &nsinit.DefaultStateWriter{})
ns = nsinit.NewNsInit(&nsinit.DefaultCommandFactory{}, &nsinit.DefaultStateWriter{args.Root})
)
f, err := os.Open("container.json")
f, err := os.Open(filepath.Join(args.Root, "container.json"))
if err != nil {
return err
}
@ -57,6 +57,9 @@ type driver struct {
}
func NewDriver(root string) (*driver, error) {
if err := os.MkdirAll(root, 0655); err != nil {
return nil, err
}
return &driver{
root: root,
}, nil
@ -66,14 +69,18 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
var (
term nsinit.Terminal
container = createContainer(c)
factory = &dockerCommandFactory{c}
factory = &dockerCommandFactory{c: c, driver: d}
stateWriter = &dockerStateWriter{
callback: startCallback,
c: c,
dsw: &nsinit.DefaultStateWriter{c.Rootfs},
dsw: &nsinit.DefaultStateWriter{filepath.Join(d.root, c.ID)},
}
ns = nsinit.NewNsInit(factory, stateWriter)
ns = nsinit.NewNsInit(factory, stateWriter)
args = append([]string{c.Entrypoint}, c.Arguments...)
)
if err := d.createContainerRoot(c.ID); err != nil {
return -1, err
}
if c.Tty {
term = &dockerTtyTerm{
pipes: pipes,
@ -84,10 +91,9 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
}
}
c.Terminal = term
if err := writeContainerFile(container, c.Rootfs); err != nil {
if err := d.writeContainerFile(container, c.ID); err != nil {
return -1, err
}
args := append([]string{c.Entrypoint}, c.Arguments...)
return ns.Exec(container, term, args)
}
@ -98,9 +104,9 @@ func (d *driver) Kill(p *execdriver.Command, sig int) error {
func (d *driver) Restore(c *execdriver.Command) error {
var (
nspid int
p = filepath.Join(d.root, "containers", c.ID, "root", ".nspid")
path = filepath.Join(d.root, c.ID, "pid")
)
f, err := os.Open(p)
f, err := os.Open(path)
if err != nil {
return err
}
@ -109,7 +115,7 @@ func (d *driver) Restore(c *execdriver.Command) error {
return err
}
f.Close()
defer os.Remove(p)
defer os.Remove(path)
proc, err := os.FindProcess(nspid)
if err != nil {
@ -167,12 +173,16 @@ func (d *driver) GetPidsForContainer(id string) ([]int, error) {
return pids, nil
}
func writeContainerFile(container *libcontainer.Container, rootfs string) error {
func (d *driver) writeContainerFile(container *libcontainer.Container, id string) error {
data, err := json.Marshal(container)
if err != nil {
return err
}
return ioutil.WriteFile(filepath.Join(rootfs, "container.json"), data, 0755)
return ioutil.WriteFile(filepath.Join(d.root, id, "container.json"), data, 0655)
}
func (d *driver) createContainerRoot(id string) error {
return os.MkdirAll(filepath.Join(d.root, id), 0655)
}
func getEnv(key string, env []string) string {
@ -186,7 +196,8 @@ func getEnv(key string, env []string) string {
}
type dockerCommandFactory struct {
c *execdriver.Command
c *execdriver.Command
driver *driver
}
// createCommand will return an exec.Cmd with the Cloneflags set to the proper namespaces
@ -202,6 +213,7 @@ func (d *dockerCommandFactory) Create(container *libcontainer.Container, console
"-driver", DriverName,
"-console", console,
"-pipe", fmt.Sprint(syncFd),
"-root", filepath.Join(d.driver.root, d.c.ID),
}, args...)
d.c.SysProcAttr = &syscall.SysProcAttr{
Cloneflags: uintptr(nsinit.GetNamespaceFlags(container.Namespaces)),

3
execdriver/native/info.go
View file

@ -14,8 +14,7 @@ type info struct {
// .nspid file for a container. If the file exists then the
// container is currently running
func (i *info) IsRunning() bool {
p := filepath.Join(i.driver.root, "containers", i.ID, "root", ".nspid")
if _, err := os.Stat(p); err == nil {
if _, err := os.Stat(filepath.Join(i.driver.root, i.ID, "pid")); err == nil {
return true
}
return false

2
pkg/libcontainer/nsinit/execin.go
View file

@ -42,7 +42,7 @@ func (ns *linuxNs) ExecIn(container *libcontainer.Container, nspid int, args []s
// if the container has a new pid and mount namespace we need to
// remount proc and sys to pick up the changes
if container.Namespaces.Contains("CLONE_NEWNS") && container.Namespaces.Contains("CLONE_NEWPID") {
if container.Namespaces.Contains("NEWNS") && container.Namespaces.Contains("NEWPID") {
pid, err := system.Fork()
if err != nil {
return -1, err

12
pkg/libcontainer/nsinit/nsinit/main.go
View file

@ -9,12 +9,13 @@ import (
"io/ioutil"
"log"
"os"
"path/filepath"
"strconv"
)
var (
console string
pipeFd int
root, console string
pipeFd int
)
var (
@ -25,6 +26,7 @@ var (
func registerFlags() {
flag.StringVar(&console, "console", "", "console (pty slave) path")
flag.IntVar(&pipeFd, "pipe", 0, "sync pipe fd")
flag.StringVar(&root, "root", ".", "root for storing configuration data")
flag.Parse()
}
@ -84,7 +86,7 @@ func main() {
}
func loadContainer() (*libcontainer.Container, error) {
f, err := os.Open("container.json")
f, err := os.Open(filepath.Join(root, "container.json"))
if err != nil {
return nil, err
}
@ -98,7 +100,7 @@ func loadContainer() (*libcontainer.Container, error) {
}
func readPid() (int, error) {
data, err := ioutil.ReadFile(".nspid")
data, err := ioutil.ReadFile(filepath.Join(root, "pid"))
if err != nil {
return -1, err
}
@ -110,5 +112,5 @@ func readPid() (int, error) {
}
func newNsInit() (nsinit.NsInit, error) {
return nsinit.NewNsInit(&nsinit.DefaultCommandFactory{}, &nsinit.DefaultStateWriter{}), nil
return nsinit.NewNsInit(&nsinit.DefaultCommandFactory{}, &nsinit.DefaultStateWriter{root}), nil
}

6
pkg/libcontainer/nsinit/state.go
View file

@ -18,11 +18,11 @@ type DefaultStateWriter struct {
Root string
}
// writePidFile writes the namespaced processes pid to .nspid in the rootfs for the container
// writePidFile writes the namespaced processes pid to pid in the rootfs for the container
func (d *DefaultStateWriter) WritePid(pid int) error {
return ioutil.WriteFile(filepath.Join(d.Root, ".nspid"), []byte(fmt.Sprint(pid)), 0655)
return ioutil.WriteFile(filepath.Join(d.Root, "pid"), []byte(fmt.Sprint(pid)), 0655)
}
func (d *DefaultStateWriter) DeletePid() error {
return os.Remove(filepath.Join(d.Root, ".nspid"))
return os.Remove(filepath.Join(d.Root, "pid"))
}

2
runtime.go
View file

@ -711,7 +711,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig, eng *engine.Engine) (*Runtime
case "lxc":
ed, err = lxc.NewDriver(config.Root, sysInfo.AppArmor)
case "native":
ed, err = native.NewDriver(config.Root)
ed, err = native.NewDriver(path.Join(config.Root, "native"))
default:
return nil, fmt.Errorf("unknown exec driver %s", config.ExecDriver)
}

2
sysinit/sysinit.go
View file

@ -55,6 +55,7 @@ func SysInit() {
driver = flag.String("driver", "", "exec driver")
pipe = flag.Int("pipe", 0, "sync pipe fd")
console = flag.String("console", "", "console (pty slave) path")
root = flag.String("root", ".", "root path for configuration files")
)
flag.Parse()
@ -82,6 +83,7 @@ func SysInit() {
Driver: *driver,
Console: *console,
Pipe: *pipe,
Root: *root,
}
if err := executeProgram(args); err != nil {