Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.20] oci: always reap conmon zombies #5704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Mar 5, 2022
Merged

[release-1.20] oci: always reap conmon zombies #5704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d89b148
oci: always reap conmon zombies
haircommander Dec 13, 2021
d42b536
run make mockgen to fix unit tests
haircommander Mar 4, 2022
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
41 changes: 27 additions & 14 deletions internal/oci/runtime_oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,37 @@ func (r *runtimeOCI) CreateContainer(c *Container, cgroupParent string) (retErr
childPipe.Close()
childStartPipe.Close()

// Platform specific container setup
if err := r.createContainerPlatform(c, cgroupParent, cmd.Process.Pid); err != nil {
if killErr := cmd.Process.Kill(); killErr != nil {
return errors.Wrap(err, killErr.Error())
// Create new scope to reduce cleanup code.
if err := func() (retErr error) {
defer func() {
if retErr != nil {
// We need to always kill and wait on this process.
// Failing to do so will cause us to leak a zombie.
killErr := cmd.Process.Kill()
waitErr := cmd.Wait()
if killErr != nil {
retErr = errors.Wrapf(retErr, "failed to kill %+v after failing with", killErr)
}
// Per https://pkg.go.dev/os#ProcessState.ExitCode, the exit code is -1 when the process died because
// of a signal. We expect this in this case, as we've just killed it with a signal. Don't append the
// error in this case to reduce noise.
if exitErr, ok := waitErr.(*exec.ExitError); !ok || exitErr.ExitCode() != -1 {
retErr = errors.Wrapf(retErr, "failed to wait %+v after failing with", waitErr)
}
}
}()
// Platform specific container setup
if err := r.createContainerPlatform(c, cgroupParent, cmd.Process.Pid); err != nil {
return err
}
return err
}

/* We set the cgroup, now the child can start creating children */
someData := []byte{0}
_, err = parentStartPipe.Write(someData)
if err != nil {
if waitErr := cmd.Wait(); waitErr != nil {
return errors.Wrap(err, waitErr.Error())
}
/* We set the cgroup, now the child can start creating children */
someData := []byte{0}
_, err = parentStartPipe.Write(someData)
return err
}(); err != nil {
return err
}

/* Wait for initial setup and fork, and reap child */
err = cmd.Wait()
if err != nil {
Expand Down
19 changes: 9 additions & 10 deletions test/mocks/cmdrunner/cmdrunner.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.