p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 626 Packages Projects Releases Wiki Activity

libcontainerd: prevent exec delete locking

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 332f134890246cfc73703b2911c9fdc20e063096)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6646d0878247b1e0875da33da606283f5d16ea07
Component: engine
This commit is contained in:
Tonis Tiigi
2018-12-17 12:22:37 +02:00
committed by Andrew Hsu
parent b00fb7cf05
commit dba1b4aeda
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/libcontainerd/client_daemon.go
View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/typeurl"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/ioutils"
"github.com/opencontainers/image-spec/specs-go/v1"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
@ -384,7 +384,12 @@ func (c *client) Exec(ctx context.Context, containerID, processID string, spec *
defer close(stdinCloseSync)
if err = p.Start(ctx); err != nil {
p.Delete(context.Background())
// use new context for cleanup because old one may be cancelled by user, but leave a timeout to make sure
// we are not waiting forever if containerd is unresponsive or to work around fifo cancelling issues in
// older containerd-shim
ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second)
defer cancel()
p.Delete(ctx)
ctr.deleteProcess(processID)
return -1, wrapError(err)
}