fix csi data mover cleanup to remove orphaned VolumeSnapshotContent when DataUpload creation fails - #10289
Open
samay43 wants to merge 2 commits into
Open
Conversation
👷 Deploy request for velero pending review.Visit the deploys page to approve it
|
…SnapshotContent Signed-off-by: samay43 <samayrbhat43@gmail.com>
Signed-off-by: samay43 <samayrbhat43@gmail.com>
samay43
force-pushed
the
fix/csi-cleanup-vsc-on-dataupload-failure
branch
from
August 16, 2026 07:59
bcab942 to
2440406
Compare
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
summary of change
When CSI snapshot data movement is enabled,
createDataUploadcan fail after theVolumeSnapshothas been created but before the CSI snapshot controller has bound it to aVolumeSnapshotContent(i.e. beforeStatus.BoundVolumeSnapshotContentNameis populated). In that window,
CleanupVolumeSnapshotskipped patching theVolumeSnapshotContent'sDeletionPolicy, deleted only theVolumeSnapshot, and left aRetain-policyVolumeSnapshotContent(and its underlying provider snapshot)orphaned.
This adds a fallback: when
Status.BoundVolumeSnapshotContentNameis not yet set,CleanupVolumeSnapshotnow listsVolumeSnapshotContents and matches onSpec.VolumeSnapshotRef, which is populated at content-creation time regardless of theVolumeSnapshot's status. This ensures the orphaned content still gets itsdeletion policy patched to
Delete. Verified:go build ./...passes cleanly, and all existing plus new tests inpkg/util/csiandpkg/backup/actions/csipass.fixed issue
Fixes #10287
Please indicate you've done the following:
make new-changelog) or comment/kind changelog-not-requiredon this PR.site/content/docs/main.