kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #39677 from kolyshkin/lost-ctx

Browse source 
daemon/ProcessEvent: make sure to cancel the contexts
This commit is contained in:
Brian Goff 2019-09-04 13:28:06 -07:00 • committed by GitHub
commit 00c9e7720b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
daemon/monitor.go
View file

@ -54,9 +54,9 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
if err != nil { if err != nil {
logrus.WithError(err).Warnf("failed to delete container %s from containerd", c.ID) logrus.WithError(err).Warnf("failed to delete container %s from containerd", c.ID)
} }
ctx, _ := context.WithTimeout(context.Background(), 2*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
c.StreamConfig.Wait(ctx) c.StreamConfig.Wait(ctx)
cancel()
c.Reset(false) c.Reset(false)
exitStatus := container.ExitStatus{ exitStatus := container.ExitStatus{
@ -125,8 +125,9 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
execConfig.ExitCode = &ec execConfig.ExitCode = &ec
execConfig.Running = false execConfig.Running = false
ctx, _ := context.WithTimeout(context.Background(), 2*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
execConfig.StreamConfig.Wait(ctx) execConfig.StreamConfig.Wait(ctx)
cancel()
if err := execConfig.CloseStreams(); err != nil { if err := execConfig.CloseStreams(); err != nil {
logrus.Errorf("failed to cleanup exec %s streams: %s", c.ID, err) logrus.Errorf("failed to cleanup exec %s streams: %s", c.ID, err)