beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46505 from vvoland/libcontainerd-windows-reap-fix-24

Browse source 
[24.0 backport] libcontainerd/windows: Fix cleanup on `newIOFromProcess` error
This commit is contained in:
Sebastiaan van Stijn 2023-09-19 21:52:22 +02:00 committed by GitHub
commit 20c688f84d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libcontainerd/local/local_windows.go
View file

@ -388,7 +388,7 @@ func (c *client) extractResourcesFromSpec(spec *specs.Spec, configuration *hcssh
} }
} }
func (ctr *container) Start(_ context.Context, _ string, withStdin bool, attachStdio libcontainerdtypes.StdioCallback) (libcontainerdtypes.Task, error) { func (ctr *container) Start(_ context.Context, _ string, withStdin bool, attachStdio libcontainerdtypes.StdioCallback) (_ libcontainerdtypes.Task, retErr error) {
ctr.mu.Lock() ctr.mu.Lock()
defer ctr.mu.Unlock() defer ctr.mu.Unlock()
@ -445,7 +445,7 @@ func (ctr *container) Start(_ context.Context, _ string, withStdin bool, attachS
} }
defer func() { defer func() {
if err != nil { if retErr != nil {
if err := newProcess.Kill(); err != nil { if err := newProcess.Kill(); err != nil {
logger.WithError(err).Error("failed to kill process") logger.WithError(err).Error("failed to kill process")
} }
@ -459,23 +459,11 @@ func (ctr *container) Start(_ context.Context, _ string, withStdin bool, attachS
}() }()
} }
}() }()
t := &task{process: process{
id: ctr.id, pid := newProcess.Pid()
ctr: ctr,
hcsProcess: newProcess,
waitCh: make(chan struct{}),
}}
pid := t.Pid()
logger.WithField("pid", pid).Debug("init process started") logger.WithField("pid", pid).Debug("init process started")
// Spin up a goroutine to notify the backend and clean up resources when dio, err := newIOFromProcess(newProcess, ctr.ociSpec.Process.Terminal)
// the task exits. Defer until after the start event is sent so that the
// exit event is not sent out-of-order.
defer func() { go t.reap() }()
// Don't shadow err here due to our deferred clean-up.
var dio *cio.DirectIO
dio, err = newIOFromProcess(newProcess, ctr.ociSpec.Process.Terminal)
if err != nil { if err != nil {
logger.WithError(err).Error("failed to get stdio pipes") logger.WithError(err).Error("failed to get stdio pipes")
return nil, err return nil, err
@ -486,16 +474,28 @@ func (ctr *container) Start(_ context.Context, _ string, withStdin bool, attachS
return nil, err return nil, err
} }
t := &task{process{
id: ctr.id,
ctr: ctr,
hcsProcess: newProcess,
waitCh: make(chan struct{}),
}}
// All fallible operations have succeeded so it is now safe to set the // All fallible operations have succeeded so it is now safe to set the
// container's current task. // container's current task.
ctr.task = t ctr.task = t
// Spin up a goroutine to notify the backend and clean up resources when
// the task exits. Defer until after the start event is sent so that the
// exit event is not sent out-of-order.
defer func() { go t.reap() }()
// Generate the associated event // Generate the associated event
ctr.client.eventQ.Append(ctr.id, func() { ctr.client.eventQ.Append(ctr.id, func() {
ei := libcontainerdtypes.EventInfo{ ei := libcontainerdtypes.EventInfo{
ContainerID: ctr.id, ContainerID: ctr.id,
ProcessID: t.id, ProcessID: t.id,
Pid: pid, Pid: uint32(pid),
} }
ctr.client.logger.WithFields(logrus.Fields{ ctr.client.logger.WithFields(logrus.Fields{
"container": ctr.id, "container": ctr.id,
@ -556,7 +556,7 @@ func newIOFromProcess(newProcess hcsshim.Process, terminal bool) (*cio.DirectIO,
// The processID argument is entirely informational. As there is no mechanism // The processID argument is entirely informational. As there is no mechanism
// (exposed through the libcontainerd interfaces) to enumerate or reference an // (exposed through the libcontainerd interfaces) to enumerate or reference an
// exec'd process by ID, uniqueness is not currently enforced. // exec'd process by ID, uniqueness is not currently enforced.
func (t *task) Exec(ctx context.Context, processID string, spec *specs.Process, withStdin bool, attachStdio libcontainerdtypes.StdioCallback) (libcontainerdtypes.Process, error) { func (t *task) Exec(ctx context.Context, processID string, spec *specs.Process, withStdin bool, attachStdio libcontainerdtypes.StdioCallback) (_ libcontainerdtypes.Process, retErr error) {
hcsContainer, err := t.getHCSContainer() hcsContainer, err := t.getHCSContainer()
if err != nil { if err != nil {
return nil, err return nil, err
@ -607,9 +607,8 @@ func (t *task) Exec(ctx context.Context, processID string, spec *specs.Process,
logger.WithError(err).Errorf("exec's CreateProcess() failed") logger.WithError(err).Errorf("exec's CreateProcess() failed")
return nil, err return nil, err
} }
pid := newProcess.Pid()
defer func() { defer func() {
if err != nil { if retErr != nil {
if err := newProcess.Kill(); err != nil { if err := newProcess.Kill(); err != nil {
logger.WithError(err).Error("failed to kill process") logger.WithError(err).Error("failed to kill process")
} }
@ -647,6 +646,7 @@ func (t *task) Exec(ctx context.Context, processID string, spec *specs.Process,
// the exit event is not sent out-of-order. // the exit event is not sent out-of-order.
defer func() { go p.reap() }() defer func() { go p.reap() }()
pid := newProcess.Pid()
t.ctr.client.eventQ.Append(t.ctr.id, func() { t.ctr.client.eventQ.Append(t.ctr.id, func() {
ei := libcontainerdtypes.EventInfo{ ei := libcontainerdtypes.EventInfo{
ContainerID: t.ctr.id, ContainerID: t.ctr.id,