Skip to content
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

oci: exit gracefully if container is already dead instead of trying to kill it. #12394

Merged
merged 2 commits into from
Nov 23, 2021
Merged

oci: exit gracefully if container is already dead instead of trying to kill it. #12394

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08558b2
oci: exit gracefully if container is already dead
flouthoc Nov 23, 2021
a4e4b8d
oci: ack crun output when container is not there
flouthoc Nov 23, 2021
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 libpod/oci_conmon_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ func (r *ConmonOCIRuntime) UpdateContainerStatus(ctr *Container) error {
if err2 != nil {
return errors.Wrapf(err, "error getting container %s state", ctr.ID())
}
if strings.Contains(string(out), "does not exist") {
if strings.Contains(string(out), "does not exist") || strings.Contains(string(out), "No such file") {
if err := ctr.removeConmonFiles(); err != nil {
logrus.Debugf("unable to remove conmon files for container %s", ctr.ID())
}
Expand Down Expand Up @@ -407,6 +407,11 @@ func (r *ConmonOCIRuntime) KillContainer(ctr *Container, signal uint, all bool)
args = append(args, "kill", ctr.ID(), fmt.Sprintf("%d", signal))
}
if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, env, r.path, args...); err != nil {
// try updating container state but ignore errors we cant do anything if this fails.
r.UpdateContainerStatus(ctr)
if ctr.state.State == define.ContainerStateExited {
return nil
}
return errors.Wrapf(err, "error sending signal to container %s", ctr.ID())
}

Expand Down