Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] libcontainerd: prevent exec delete locking #140

Merged
merged 2 commits into from
Dec 17, 2018
Merged

[18.09] libcontainerd: prevent exec delete locking #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9ae6c7
Revert "Propagate context to exec delete"
andrewhsu Dec 17, 2018
6646d08
libcontainerd: prevent exec delete locking
tonistiigi Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libcontainerd/client_daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -384,6 +384,11 @@ func (c *client) Exec(ctx context.Context, containerID, processID string, spec *
defer close(stdinCloseSync)

if err = p.Start(ctx); err != nil {
// 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)
Expand Down