Update containerd to cfb82a876ecc11b5ca0977d1733adbe58599088a

[mlaventure]

Signed-off-by: Kenfe-Mickael Laventure [email protected]

---

This include the following:

• [v0.2.x] containerd: ignore SIGPIPE containerd/containerd#930
• Correct 'go vet' errors containerd/containerd#706
• add syscall.EPOLL_CLOEXEC containerd/containerd#855

Diff is as follow:

diff --git a/containerd-shim/main.go b/containerd-shim/main.go
index 50ed461..6b59f4e 100644
--- a/containerd-shim/main.go
+++ b/containerd-shim/main.go
@@ -156,7 +156,6 @@ func start(log *os.File) error {
 			}
 		}
 	}
-	return nil
 }
 
 func writeInt(path string, i int) error {
diff --git a/containerd/main.go b/containerd/main.go
index eb4f6ce..6b33074 100644
--- a/containerd/main.go
+++ b/containerd/main.go
@@ -208,6 +208,8 @@ func daemon(context *cli.Context) error {
 	}
 	for ss := range s {
 		switch ss {
+		case syscall.SIGPIPE:
+			continue
 		default:
 			logrus.Infof("stopping containerd after receiving %s", ss)
 			server.Stop()
diff --git a/runtime/container.go b/runtime/container.go
index 43351ca..a9677c4 100644
--- a/runtime/container.go
+++ b/runtime/container.go
@@ -544,7 +544,6 @@ func (c *container) createCmd(ctx context.Context, pid string, cmd *exec.Cmd, p
 	case err := <-ch:
 		return err
 	}
-	return nil
 }
 
 func hostIDFromMap(id uint32, mp []ocs.LinuxIDMapping) int {
diff --git a/runtime/process.go b/runtime/process.go
index 22d0192..2df67d9 100644
--- a/runtime/process.go
+++ b/runtime/process.go
@@ -233,7 +233,7 @@ func (p *process) updateExitStatusFile(status uint32) (uint32, error) {
 	p.stateLock.Lock()
 	p.state = Stopped
 	p.stateLock.Unlock()
-	err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%u", status)), 0644)
+	err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%d", status)), 0644)
 	return status, err
 }
 
diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go
index 83e2e83..98c8e4e 100644
--- a/runtime/runtime_test.go
+++ b/runtime/runtime_test.go
@@ -157,7 +157,7 @@ func BenchmarkBusyboxSh(b *testing.B) {
 		})
 
 		if err != nil {
-			b.Fatalf("Error creating a New container: ", err)
+			b.Fatalf("Error creating a New container: %v", err)
 		}
 
 		benchmarkStartContainer(b, c, s, bundleName)
diff --git a/supervisor/delete.go b/supervisor/delete.go
index 94b0b7c..3f5f6d8 100644
--- a/supervisor/delete.go
+++ b/supervisor/delete.go
@@ -27,13 +27,14 @@ func (s *Supervisor) delete(t *DeleteTask) error {
 			t.Process.Wait()
 		}
 		if !t.NoEvent {
-			execMap := s.getDeleteExecSyncMap(t.ID)
+			execMap := s.getExecSyncMap(t.ID)
 			go func() {
 				// Wait for all exec processe events to be sent (we seem
 				// to sometimes receive them after the init event)
 				for _, ch := range execMap {
 					<-ch
 				}
+				s.deleteExecSyncMap(t.ID)
 				s.notifySubscribers(Event{
 					Type:      StateExit,
 					Timestamp: time.Now(),
diff --git a/supervisor/monitor_linux.go b/supervisor/monitor_linux.go
index 51438ff..b643b88 100644
--- a/supervisor/monitor_linux.go
+++ b/supervisor/monitor_linux.go
@@ -16,7 +16,7 @@ func NewMonitor() (*Monitor, error) {
 		exits:     make(chan runtime.Process, 1024),
 		ooms:      make(chan string, 1024),
 	}
-	fd, err := archutils.EpollCreate1(0)
+	fd, err := archutils.EpollCreate1(syscall.EPOLL_CLOEXEC)
 	if err != nil {
 		return nil, err
 	}
diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go
index 1d656f5..41539b1 100644
--- a/supervisor/supervisor.go
+++ b/supervisor/supervisor.go
@@ -439,10 +439,14 @@ func (s *Supervisor) getExecSyncChannel(containerID, pid string) chan struct{} {
 	return ch
 }
 
-func (s *Supervisor) getDeleteExecSyncMap(containerID string) map[string]chan struct{} {
+func (s *Supervisor) getExecSyncMap(containerID string) map[string]chan struct{} {
 	s.containerExecSyncLock.Lock()
-	chs := s.containerExecSync[containerID]
+	defer s.containerExecSyncLock.Unlock()
+	return s.containerExecSync[containerID]
+}
+
+func (s *Supervisor) deleteExecSyncMap(containerID string) {
+	s.containerExecSyncLock.Lock()
+	defer s.containerExecSyncLock.Unlock()
 	delete(s.containerExecSync, containerID)
-	s.containerExecSyncLock.Unlock()
-	return chs
 }
diff --git a/testutils/testutils.go b/testutils/testutils.go
index 2feb0cc..85e50a9 100644
--- a/testutils/testutils.go
+++ b/testutils/testutils.go
@@ -36,7 +36,7 @@ func untarRootfs(source string, destination string) error {
 	rootfs := filepath.Join(destination, "rootfs")
 
 	if err := os.MkdirAll(rootfs, 0755); err != nil {
-		fmt.Println("untarRootfs os.MkdirAll failed with err %v", err)
+		fmt.Printf("untarRootfs os.MkdirAll failed with err %v", err)
 		return nil
 	}
 	tar := exec.Command("tar", "-C", rootfs, "-xf", source)

[andrewhsu]

LGTM