Merge pull request #3559 from fuweid/avoid-read-config

estesp · web-flow · commit 640860a042b9 · 2019-08-20T13:08:55.000-04:00
runtime: only check killall for init process
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -515,33 +515,35 @@ func (s *Service) allProcesses() []process.Process {
 }
 
 func (s *Service) checkProcesses(e runc.Exit) {
-	shouldKillAll, err := shouldKillAllOnExit(s.bundle)
-	if err != nil {
-		log.G(s.context).WithError(err).Error("failed to check shouldKillAll")
-	}
-
 	for _, p := range s.allProcesses() {
-		if p.Pid() == e.Pid {
+		if p.Pid() != e.Pid {
+			continue
+		}
 
+		if ip, ok := p.(*process.Init); ok {
+			shouldKillAll, err := shouldKillAllOnExit(s.bundle)
+			if err != nil {
+				log.G(s.context).WithError(err).Error("failed to check shouldKillAll")
+			}
+
+			// Ensure all children are killed
 			if shouldKillAll {
-				if ip, ok := p.(*process.Init); ok {
-					// Ensure all children are killed
-					if err := ip.KillAll(s.context); err != nil {
-						log.G(s.context).WithError(err).WithField("id", ip.ID()).
-							Error("failed to kill init's children")
-					}
+				if err := ip.KillAll(s.context); err != nil {
+					log.G(s.context).WithError(err).WithField("id", ip.ID()).
+						Error("failed to kill init's children")
 				}
 			}
-			p.SetExited(e.Status)
-			s.events <- &eventstypes.TaskExit{
-				ContainerID: s.id,
-				ID:          p.ID(),
-				Pid:         uint32(e.Pid),
-				ExitStatus:  uint32(e.Status),
-				ExitedAt:    p.ExitedAt(),
-			}
-			return
 		}
+
+		p.SetExited(e.Status)
+		s.events <- &eventstypes.TaskExit{
+			ContainerID: s.id,
+			ID:          p.ID(),
+			Pid:         uint32(e.Pid),
+			ExitStatus:  uint32(e.Status),
+			ExitedAt:    p.ExitedAt(),
+		}
+		return
 	}
 }
 
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -646,36 +646,41 @@ func (s *service) checkProcesses(e runcC.Exit) {
 	defer s.mu.Unlock()
 
 	for _, container := range s.containers {
-		if container.HasPid(e.Pid) {
-			shouldKillAll, err := shouldKillAllOnExit(container.Bundle)
-			if err != nil {
-				log.G(s.context).WithError(err).Error("failed to check shouldKillAll")
+		if !container.HasPid(e.Pid) {
+			continue
+		}
+
+		for _, p := range container.All() {
+			if p.Pid() != e.Pid {
+				continue
 			}
 
-			for _, p := range container.All() {
-				if p.Pid() == e.Pid {
-					if shouldKillAll {
-						if ip, ok := p.(*process.Init); ok {
-							// Ensure all children are killed
-							if err := ip.KillAll(s.context); err != nil {
-								logrus.WithError(err).WithField("id", ip.ID()).
-									Error("failed to kill init's children")
-							}
-						}
+			if ip, ok := p.(*process.Init); ok {
+				shouldKillAll, err := shouldKillAllOnExit(container.Bundle)
+				if err != nil {
+					log.G(s.context).WithError(err).Error("failed to check shouldKillAll")
+				}
+
+				// Ensure all children are killed
+				if shouldKillAll {
+					if err := ip.KillAll(s.context); err != nil {
+						logrus.WithError(err).WithField("id", ip.ID()).
+							Error("failed to kill init's children")
 					}
-					p.SetExited(e.Status)
-					s.sendL(&eventstypes.TaskExit{
-						ContainerID: container.ID,
-						ID:          p.ID(),
-						Pid:         uint32(e.Pid),
-						ExitStatus:  uint32(e.Status),
-						ExitedAt:    p.ExitedAt(),
-					})
-					return
 				}
 			}
+
+			p.SetExited(e.Status)
+			s.sendL(&eventstypes.TaskExit{
+				ContainerID: container.ID,
+				ID:          p.ID(),
+				Pid:         uint32(e.Pid),
+				ExitStatus:  uint32(e.Status),
+				ExitedAt:    p.ExitedAt(),
+			})
 			return
 		}
+		return
 	}
 }
 
