github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
runtime: only check killall for init process
This commit is contained in:
Phil Estes 2019-08-20 13:08:55 -04:00 committed by GitHub
commit 640860a042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/v1/shim/service.go
View File

@ -515,23 +515,26 @@ func (s *Service) allProcesses() []process.Process {
}
func (s *Service) checkProcesses(e runc.Exit) {
for _, p := range s.allProcesses() {
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")
}
for _, p := range s.allProcesses() {
if p.Pid() == e.Pid {
if shouldKillAll {
if ip, ok := p.(*process.Init); ok {
// Ensure all children are killed
if shouldKillAll {
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,
@ -542,7 +545,6 @@ func (s *Service) checkProcesses(e runc.Exit) {
}
return
}
}
}
func shouldKillAllOnExit(bundlePath string) (bool, error) {

19
runtime/v2/runc/v2/service.go
View File

@ -646,23 +646,30 @@ func (s *service) checkProcesses(e runcC.Exit) {
defer s.mu.Unlock()
for _, container := range s.containers {
if container.HasPid(e.Pid) {
if !container.HasPid(e.Pid) {
continue
}
for _, p := range container.All() {
if p.Pid() != e.Pid {
continue
}
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")
}
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 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,
@ -673,10 +680,8 @@ func (s *service) checkProcesses(e runcC.Exit) {
})
return
}
}
return
}
}
}
func shouldKillAllOnExit(bundlePath string) (bool, error) {