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

Merge pull request #9270 from fuweid/fix-sb-issues

Browse Source 
pkg/cri: should ignore no sandbox bucket
This commit is contained in:
Derek McGowan 2023-10-21 21:44:16 +00:00 committed by GitHub
commit 18c9e7ec4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
metadata/sandbox.go
View File

@ -239,6 +239,9 @@ func (s *sandboxStore) Delete(ctx context.Context, id string) error {
} }
if err := buckets.DeleteBucket([]byte(id)); err != nil { if err := buckets.DeleteBucket([]byte(id)); err != nil {
if err == bbolt.ErrBucketNotFound {
err = errdefs.ErrNotFound
}
return fmt.Errorf("failed to delete sandbox %q: %w", id, err) return fmt.Errorf("failed to delete sandbox %q: %w", id, err)
} }

5
pkg/cri/server/sandbox_remove.go
View File

@ -105,7 +105,10 @@ func (c *criService) RemovePodSandbox(ctx context.Context, r *runtime.RemovePodS
c.sandboxStore.Delete(id) c.sandboxStore.Delete(id)
if err := c.client.SandboxStore().Delete(ctx, id); err != nil { if err := c.client.SandboxStore().Delete(ctx, id); err != nil {
return nil, fmt.Errorf("failed to remove sandbox metadata from store: %w", err) if !errdefs.IsNotFound(err) {
return nil, fmt.Errorf("failed to remove sandbox metadata from store: %w", err)
}
log.G(ctx).WithError(err).Warnf("failed to delete sandbox metadata from store: %q maybe recovered from v1.x release", id)
} }
// Release the sandbox name reserved for the sandbox. // Release the sandbox name reserved for the sandbox.