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

Merge pull request #10839 from matteopulcini6/sandbox-deferring-teardown-main

Browse Source 
Handle teardown failure to avoid blocking cleanup
This commit is contained in:
Phil Estes 2024-10-16 15:54:56 +00:00 committed by GitHub
commit 0abada6251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/cri/server/sandbox_run.go
View File

@ -220,6 +220,11 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
// Teardown network if an error is returned. // Teardown network if an error is returned.
if cleanupErr = c.teardownPodNetwork(deferCtx, sandbox); cleanupErr != nil { if cleanupErr = c.teardownPodNetwork(deferCtx, sandbox); cleanupErr != nil {
log.G(ctx).WithError(cleanupErr).Errorf("Failed to destroy network for sandbox %q", id) log.G(ctx).WithError(cleanupErr).Errorf("Failed to destroy network for sandbox %q", id)
// ignoring failed to destroy networks when we failed to setup networks
if sandbox.CNIResult == nil {
cleanupErr = nil
}
} }
} }