github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9611 from adityaramani/main

Browse Source 
Handle failure when stopping a sandbox
This commit is contained in:
Fu Wei 2024-01-09 15:11:07 +00:00 committed by GitHub
commit 46bca49bfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sandbox/controller.go
View File

@ -201,12 +201,18 @@ func (c *controllerLocal) Stop(ctx context.Context, sandboxID string, opts ...sa
} }
svc, err := c.getSandbox(ctx, sandboxID) svc, err := c.getSandbox(ctx, sandboxID)
if errdefs.IsNotFound(err) {
return nil
}
if err != nil { if err != nil {
return err return err
} }
if _, err := svc.StopSandbox(ctx, req); err != nil { if _, err := svc.StopSandbox(ctx, req); err != nil {
return fmt.Errorf("failed to stop sandbox: %w", errdefs.FromGRPC(err)) err = errdefs.FromGRPC(err)
if !errdefs.IsNotFound(err) && !errdefs.IsUnavailable(err) {
return fmt.Errorf("failed to stop sandbox: %w", err)
}
} }
return nil return nil