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

Skip to content

[release-1.19] runtime_vm: Fix non terminating pods #4283

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 4 commits into from
Oct 20, 2020
Merged

[release-1.19] runtime_vm: Fix non terminating pods #4283

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffeb564
runtime_vm: Fix updateContainerStatus() logic
fidencio Oct 8, 2020
bad105d
runtime_vm: Don't let wait() return ttrpc.ErrClosed
fidencio Oct 14, 2020
fd3dd42
runtime_vm: StopContainers() should not fail when the VM is shutdown
fidencio Oct 14, 2020
9641a43
runtime_vm: Ignore ttrpc.ErrClosed when removing a container
fidencio Oct 14, 2020
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
14 changes: 10 additions & 4 deletions internal/oci/runtime_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,10 @@ func (r *runtimeVM) StopContainer(ctx context.Context, c *Container, timeout int

stopCh := make(chan error)
go func() {
if _, err := r.wait(ctx, c.ID(), ""); err != nil {
// errdefs.ErrNotFound actually comes from a closed connection, which is expected
// when stoping the container, with the agent and the VM going off. In such case.
// let's just ignore the error.
if _, err := r.wait(ctx, c.ID(), ""); err != nil && !errors.Is(err, errdefs.ErrNotFound) {
stopCh <- errdefs.FromGRPC(err)
}

Expand Down Expand Up @@ -629,7 +632,7 @@ func (r *runtimeVM) updateContainerStatus(c *Container) error {
ID: c.ID(),
})
if err != nil {
if errors.Is(err, ttrpc.ErrClosed) {
if !errors.Is(err, ttrpc.ErrClosed) {
return errdefs.FromGRPC(err)
}
return errdefs.ErrNotFound
Expand Down Expand Up @@ -808,7 +811,10 @@ func (r *runtimeVM) wait(ctx context.Context, ctrID, execID string) (int32, erro
ExecID: execID,
})
if err != nil {
return -1, errdefs.FromGRPC(err)
if !errors.Is(err, ttrpc.ErrClosed) {
return -1, errdefs.FromGRPC(err)
}
return -1, errdefs.ErrNotFound
}

return int32(resp.ExitStatus), nil
Expand All @@ -831,7 +837,7 @@ func (r *runtimeVM) remove(ctx context.Context, ctrID, execID string) error {
if _, err := r.task.Delete(ctx, &task.DeleteRequest{
ID: ctrID,
ExecID: execID,
}); err != nil {
}); err != nil && !errors.Is(err, ttrpc.ErrClosed) {
return errdefs.FromGRPC(err)
}

Expand Down