Merge pull request containerd#274 from crosbymichael/start-sync

mlaventure · web-flow · commit b93a33be39bc · 2016-06-27T11:11:31.000-07:00
Call start in containerd
diff --git a/containerd-shim/main.go b/containerd-shim/main.go
@@ -136,13 +136,6 @@ func start(log *os.File) error {
 					Height: uint16(msg.Height),
 				}
 				term.SetWinsize(p.console.Fd(), &ws)
-			case 2:
-				// tell runtime to execute the init process
-				if err := p.start(); err != nil {
-					p.delete()
-					p.Wait()
-					return err
-				}
 			}
 		}
 	}
diff --git a/containerd-shim/process.go b/containerd-shim/process.go
@@ -206,26 +206,6 @@ func (p *process) create() error {
 	return nil
 }
 
-func (p *process) start() error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	logPath := filepath.Join(cwd, "log.json")
-	args := append([]string{
-		"--log", logPath,
-		"--log-format", "json",
-	}, p.state.RuntimeArgs...)
-	args = append(args, "start", p.id)
-	cmd := exec.Command(p.runtime, args...)
-	cmd.Dir = p.bundle
-	cmd.Stdin = p.stdio.stdin
-	cmd.Stdout = p.stdio.stdout
-	cmd.Stderr = p.stdio.stderr
-	cmd.SysProcAttr = setPDeathSig()
-	return cmd.Run()
-}
-
 func (p *process) pid() int {
 	return p.containerPid
 }
diff --git a/integration-test/start_test.go b/integration-test/start_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"syscall"
 	"time"
@@ -326,6 +327,9 @@ func (cs *ContainerdSuite) TestOOM(t *check.C) {
 		spec.Linux.Resources.Memory = &ocs.Memory{
 			Limit: &limit,
 		}
+		if swapEnabled() {
+			spec.Linux.Resources.Memory.Swap = &limit
+		}
 	}); err != nil {
 		t.Fatal(err)
 	}
@@ -362,7 +366,7 @@ func (cs *ContainerdSuite) TestOOM(t *check.C) {
 			evt.Timestamp = e.Timestamp
 			t.Assert(*e, checker.Equals, evt)
 		case <-time.After(60 * time.Second):
-			t.Fatal("Container took more than 10 seconds to terminate")
+			t.Fatalf("Container took more than 60 seconds to %s", evt.Type)
 		}
 	}
 }
@@ -479,3 +483,8 @@ func (cs *ContainerdSuite) TestRestart(t *check.C) {
 		t.Assert(containers[i].Status, checker.Equals, "running")
 	}
 }
+
+func swapEnabled() bool {
+	_, err := os.Stat("/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes")
+	return err == nil
+}
diff --git a/runtime/process.go b/runtime/process.go
@@ -260,8 +260,33 @@ func (p *process) Signal(s os.Signal) error {
 // This should only be called on the process with ID "init"
 func (p *process) Start() error {
 	if p.ID() == InitProcessID {
-		_, err := fmt.Fprintf(p.controlPipe, "%d %d %d\n", 2, 0, 0)
-		return err
+		var (
+			errC     = make(chan error, 1)
+			shimExit = make(chan struct{}, 1)
+			args     = append(p.container.runtimeArgs, "start", p.container.id)
+			cmd      = exec.Command(p.container.runtime, args...)
+		)
+		go func() {
+			out, err := cmd.CombinedOutput()
+			if err != nil {
+				errC <- fmt.Errorf("%s: %q", err.Error(), out)
+			}
+			errC <- nil
+		}()
+		go func() {
+			p.Wait()
+			close(shimExit)
+		}()
+		select {
+		case err := <-errC:
+			if err != nil {
+				return err
+			}
+		case <-shimExit:
+			cmd.Process.Kill()
+			cmd.Wait()
+			return ErrShimExited
+		}
 	}
 	return nil
 }
diff --git a/runtime/runtime.go b/runtime/runtime.go
@@ -20,6 +20,9 @@ var (
 	// ErrContainerStartTimeout is returned if a container takes too
 	// long to start
 	ErrContainerStartTimeout = errors.New("containerd: container did not start before the specified timeout")
+	// ErrShimExited is returned if the shim or the contianer's init process
+	// exits before completing
+	ErrShimExited = errors.New("containerd: shim exited before container process was started")
 
 	errNoPidFile      = errors.New("containerd: no process pid file found")
 	errInvalidPidInt  = errors.New("containerd: process pid is invalid")
diff --git a/supervisor/worker.go b/supervisor/worker.go
@@ -62,9 +62,23 @@ func (w *worker) Start() {
 		}
 		if err := w.s.monitorProcess(process); err != nil {
 			logrus.WithField("error", err).Error("containerd: add process to monitor")
+			t.Err <- err
+			evt := &DeleteTask{
+				ID:      t.Container.ID(),
+				NoEvent: true,
+			}
+			w.s.SendTask(evt)
+			continue
 		}
 		if err := process.Start(); err != nil {
 			logrus.WithField("error", err).Error("containerd: start init process")
+			t.Err <- err
+			evt := &DeleteTask{
+				ID:      t.Container.ID(),
+				NoEvent: true,
+			}
+			w.s.SendTask(evt)
+			continue
 		}
 		ContainerStartTimer.UpdateSince(started)
 		t.Err <- nil

Original file line number	Diff line number	Diff line change
`@@ -136,13 +136,6 @@ func start(log *os.File) error {`
`136`	`136`	`Height: uint16(msg.Height),`
`137`	`137`	`}`
`138`	`138`	`term.SetWinsize(p.console.Fd(), &ws)`
`139`		`- case 2:`
`140`		`- // tell runtime to execute the init process`
`141`		`- if err := p.start(); err != nil {`
`142`		`- p.delete()`
`143`		`- p.Wait()`
`144`		`- return err`
`145`		`- }`
`146`	`139`	`}`
`147`	`140`	`}`
`148`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "os"`
`5`	`6`	`"path/filepath"`
`6`	`7`	`"syscall"`
`7`	`8`	`"time"`
`@@ -326,6 +327,9 @@ func (cs ContainerdSuite) TestOOM(t check.C) {`
`326`	`327`	`spec.Linux.Resources.Memory = &ocs.Memory{`
`327`	`328`	`Limit: &limit,`
`328`	`329`	`}`
	`330`	`+ if swapEnabled() {`
	`331`	`+ spec.Linux.Resources.Memory.Swap = &limit`
	`332`	`+ }`
`329`	`333`	`}); err != nil {`
`330`	`334`	`t.Fatal(err)`
`331`	`335`	`}`
`@@ -362,7 +366,7 @@ func (cs ContainerdSuite) TestOOM(t check.C) {`
`362`	`366`	`evt.Timestamp = e.Timestamp`
`363`	`367`	`t.Assert(*e, checker.Equals, evt)`
`364`	`368`	`case <-time.After(60 * time.Second):`
`365`		`- t.Fatal("Container took more than 10 seconds to terminate")`
	`369`	`+ t.Fatalf("Container took more than 60 seconds to %s", evt.Type)`
`366`	`370`	`}`
`367`	`371`	`}`
`368`	`372`	`}`
`@@ -479,3 +483,8 @@ func (cs ContainerdSuite) TestRestart(t check.C) {`
`479`	`483`	`t.Assert(containers[i].Status, checker.Equals, "running")`
`480`	`484`	`}`
`481`	`485`	`}`
	`486`	`+`
	`487`	`+func swapEnabled() bool {`
	`488`	`+ _, err := os.Stat("/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes")`
	`489`	`+ return err == nil`
	`490`	`+}`