Merge pull request #2774 from Random-Liu/cherrypick-#2769-release-1.1

crosbymichael · web-flow · commit 900f0d4625a3 · 2018-11-12T10:27:57.000-05:00
[release/1.1] cherry-pick: enhance: update v1/v2 runtime
diff --git a/linux/shim/service.go b/linux/shim/service.go
@@ -451,10 +451,19 @@ func (s *Service) processExits() {
 	}
 }
 
-func (s *Service) checkProcesses(e runc.Exit) {
+func (s *Service) allProcesses() []proc.Process {
 	s.mu.Lock()
 	defer s.mu.Unlock()
+
+	res := make([]proc.Process, 0, len(s.processes))
 	for _, p := range s.processes {
+		res = append(res, p)
+	}
+	return res
+}
+
+func (s *Service) checkProcesses(e runc.Exit) {
+	for _, p := range s.allProcesses() {
 		if p.Pid() == e.Pid {
 			if ip, ok := p.(*proc.Init); ok {
 				// Ensure all children are killed
