Kill shim on restore if the bundle dir is missing

yangshukui · yangshukui · commit 0581e02feec9 · 2017-04-26T13:56:49.000+08:00
Some anomalies due to the reboot of containerd(killed by docker daemon),
can lead to docker-containerd-shim residue and shim process will not exit
except you kill it manually.

Signed-off-by: yangshukui &lt;yangshukui@huawei.com&gt;
diff --git a/containerd-shim/process.go b/containerd-shim/process.go
@@ -15,6 +15,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containerd/containerd/osutils"
 	"github.com/containerd/containerd/specs"
 )
 
@@ -177,8 +178,8 @@ func (p *process) create() error {
 	cmd.Stdin = p.stdio.stdin
 	cmd.Stdout = p.stdio.stdout
 	cmd.Stderr = p.stdio.stderr
-	// Call out to setPDeathSig to set SysProcAttr as elements are platform specific
-	cmd.SysProcAttr = setPDeathSig()
+	// Call out to SetPDeathSig to set SysProcAttr as elements are platform specific
+	cmd.SysProcAttr = osutils.SetPDeathSig()
 
 	if err := cmd.Start(); err != nil {
 		if exErr, ok := err.(*exec.Error); ok {
@@ -220,7 +221,7 @@ func (p *process) pid() int {
 func (p *process) delete() error {
 	if !p.state.Exec {
 		cmd := exec.Command(p.runtime, append(p.state.RuntimeArgs, "delete", p.id)...)
-		cmd.SysProcAttr = setPDeathSig()
+		cmd.SysProcAttr = osutils.SetPDeathSig()
 		out, err := cmd.CombinedOutput()
 		if err != nil {
 			return fmt.Errorf("%s: %v", out, err)
diff --git a/containerd-shim/process_linux.go b/containerd-shim/process_linux.go
@@ -9,18 +9,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containerd/containerd/osutils"
 	"github.com/tonistiigi/fifo"
 	"golang.org/x/net/context"
 )
 
-// setPDeathSig sets the parent death signal to SIGKILL so that if the
-// shim dies the container process also dies.
-func setPDeathSig() *syscall.SysProcAttr {
-	return &syscall.SysProcAttr{
-		Pdeathsig: syscall.SIGKILL,
-	}
-}
-
 // openIO opens the pre-created fifo's for use with the container
 // in RDWR so that they remain open if the other side stops listening
 func (p *process) openIO() error {
@@ -141,7 +134,7 @@ func (p *process) Wait() {
 func (p *process) killAll() error {
 	if !p.state.Exec {
 		cmd := exec.Command(p.runtime, append(p.state.RuntimeArgs, "kill", "--all", p.id, "SIGKILL")...)
-		cmd.SysProcAttr = setPDeathSig()
+		cmd.SysProcAttr = osutils.SetPDeathSig()
 		out, err := cmd.CombinedOutput()
 		if err != nil {
 			return fmt.Errorf("%s: %v", out, err)
diff --git a/containerd-shim/process_solaris.go b/containerd-shim/process_solaris.go
@@ -8,11 +8,6 @@ import (
 	"syscall"
 )
 
-// setPDeathSig is a no-op on Solaris as Pdeathsig is not defined.
-func setPDeathSig() *syscall.SysProcAttr {
-	return nil
-}
-
 // TODO: Update to using fifo's package in openIO. Need to
 // 1. Merge and vendor changes in the package to use sys/unix.
 // 2. Figure out why context.Background is timing out.
diff --git a/osutils/pdeathsig_linux.go b/osutils/pdeathsig_linux.go
@@ -0,0 +1,15 @@
+// +build !solaris
+
+package osutils
+
+import (
+	"syscall"
+)
+
+// SetPDeathSig sets the parent death signal to SIGKILL so that if the
+// shim dies the container process also dies.
+func SetPDeathSig() *syscall.SysProcAttr {
+	return &syscall.SysProcAttr{
+		Pdeathsig: syscall.SIGKILL,
+	}
+}
diff --git a/osutils/pdeathsig_solaris.go b/osutils/pdeathsig_solaris.go
@@ -0,0 +1,8 @@
+// +build solaris
+
+package osutils
+
+// SetPDeathSig is a no-op on Solaris as Pdeathsig is not defined.
+func SetPDeathSig() *syscall.SysProcAttr {
+	return nil
+}
diff --git a/runtime/container.go b/runtime/container.go
@@ -193,6 +193,17 @@ func Load(root, id, shimName string, timeout time.Duration) (Container, error) {
 		}
 		c.processes[pid] = p
 	}
+
+	_, err = os.Stat(c.bundle)
+	if err != nil && !os.IsExist(err) {
+		for key, p := range c.processes {
+			if key == InitProcessID {
+				p.Delete()
+				break
+			}
+		}
+		return nil, fmt.Errorf("bundle dir %s don't exist", c.bundle)
+	}
 	return c, nil
 }
 
diff --git a/runtime/process.go b/runtime/process.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/containerd/containerd/osutils"
 	"github.com/containerd/containerd/specs"
 	"golang.org/x/sys/unix"
 )
@@ -458,3 +459,18 @@ func (p *process) Start() error {
 	}
 	return nil
 }
+
+// Delete delete any resources held by the container
+func (p *process) Delete() error {
+	var (
+		args = append(p.container.runtimeArgs, "delete", "-f", p.container.id)
+		cmd  = exec.Command(p.container.runtime, args...)
+	)
+
+	cmd.SysProcAttr = osutils.SetPDeathSig()
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("%s: %v", out, err)
+	}
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,17 @@ func Load(root, id, shimName string, timeout time.Duration) (Container, error) {`
`193`	`193`	`}`
`194`	`194`	`c.processes[pid] = p`
`195`	`195`	`}`
	`196`	`+`
	`197`	`+ _, err = os.Stat(c.bundle)`
	`198`	`+ if err != nil && !os.IsExist(err) {`
	`199`	`+ for key, p := range c.processes {`
	`200`	`+ if key == InitProcessID {`
	`201`	`+ p.Delete()`
	`202`	`+ break`
	`203`	`+ }`
	`204`	`+ }`
	`205`	`+ return nil, fmt.Errorf("bundle dir %s don't exist", c.bundle)`
	`206`	`+ }`
`196`	`207`	`return c, nil`
`197`	`208`	`}`
`198`	`209`