Skip to content

[release/2.2] Add defer in event of mid-function failures in RunPodSandbox to avoid mount leaks#13644

Merged
samuelkarp merged 1 commit into
containerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-13399-to-release/2.2
Jun 22, 2026
Merged

[release/2.2] Add defer in event of mid-function failures in RunPodSandbox to avoid mount leaks#13644
samuelkarp merged 1 commit into
containerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-13399-to-release/2.2

Conversation

@k8s-infra-cherrypick-robot

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Jun 22, 2026

Copy link
Copy Markdown

This is an automated cherry-pick of #13399

/assign samuelkarp

Ensure sandbox shutdown on RunPodSandbox hook failures to avoid mount leaks

Between starting the sandbox and adding it to the
sandbox store, there are opportunities for failures
including in any NRI RunPodSandbox prehooks. This defer
is added to that period so if they fail, this function
will try to clean it up itself. If the sandbox is
already added to the persistent store, it will not attempt
to stop the sandbox as it can now be recognized by other
components from the CRI store. ShutdownSandbox is used
instead of StopSandbox as it both stops it and cleans up
all its directories.

Signed-off-by: lauralorenz <[email protected]>
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 22, 2026
@samuelkarp samuelkarp moved this from Review In Progress to Merge on Green in Pull Request Review Jun 22, 2026
@samuelkarp
samuelkarp merged commit 9e3ec9d into containerd:release/2.2 Jun 22, 2026
88 of 90 checks passed
@github-project-automation github-project-automation Bot moved this from Merge on Green to Done in Pull Request Review Jun 22, 2026
@chrishenzie chrishenzie added impact/changelog area/cri Container Runtime Interface (CRI) labels Jul 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cri Container Runtime Interface (CRI) impact/changelog size/S

Projects

Development

Successfully merging this pull request may close these issues.

5 participants