daemon/ProcessEvent: make sure to cancel the contexts
Reported by govet linter:
> daemon/monitor.go:57:9: lostcancel: the cancel function returned by context.WithTimeout should be called, not discarded, to avoid a context leak (govet)
> ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
> ^
> daemon/monitor.go:128:9: lostcancel: the cancel function returned by context.WithTimeout should be called, not discarded, to avoid a context leak (govet)
> ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
> ^
Fixes: b5f288 ("Handle blocked I/O of exec'd processes")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 53cbf1797b001314035a13578ed60f015a0179e4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/daemon/monitor.go b/daemon/monitor.go
index 98455ca..2f47497 100644
--- a/daemon/monitor.go
+++ b/daemon/monitor.go
@@ -55,9 +55,9 @@
if err != nil {
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)
+ cancel()
c.Reset(false)
exitStatus := container.ExitStatus{
@@ -126,8 +126,9 @@
execConfig.ExitCode = &ec
execConfig.Running = false
- ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
+ ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
execConfig.StreamConfig.Wait(ctx)
+ cancel()
if err := execConfig.CloseStreams(); err != nil {
logrus.Errorf("failed to cleanup exec %s streams: %s", c.ID, err)
