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

Merge pull request #4204 from ashrayjain/aj/add-kill-retry

Browse Source 
Make killing shims more resilient
This commit is contained in:
Michael Crosby 2020-06-03 11:10:43 -04:00 committed by GitHub
commit 7ce8a9d7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/v1/shim/client/client.go
View File

@ -324,21 +324,31 @@ func (c *Client) signalShim(ctx context.Context, sig syscall.Signal) error {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
case <-c.waitForExit(pid): case <-c.waitForExit(ctx, pid):
return nil return nil
} }
} }
func (c *Client) waitForExit(pid int) <-chan struct{} { func (c *Client) waitForExit(ctx context.Context, pid int) <-chan struct{} {
c.exitOnce.Do(func() { go c.exitOnce.Do(func() {
defer close(c.exitCh)
ticker := time.NewTicker(10 * time.Millisecond)
defer ticker.Stop()
for { for {
// use kill(pid, 0) here because the shim could have been reparented // use kill(pid, 0) here because the shim could have been reparented
// and we are no longer able to waitpid(pid, ...) on the shim // and we are no longer able to waitpid(pid, ...) on the shim
if err := unix.Kill(pid, 0); err == unix.ESRCH { if err := unix.Kill(pid, 0); err == unix.ESRCH {
close(c.exitCh)
return return
} }
time.Sleep(10 * time.Millisecond)
select {
case <-ticker.C:
case <-ctx.Done():
log.G(ctx).WithField("pid", pid).Warn("timed out while waiting for shim to exit")
return
}
} }
}) })
return c.exitCh return c.exitCh