mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 22:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7247 from Lyndon-Li/release-1.12

Browse Source 
[1.12] Issue 7244: delete incomplete snapshot automatically for kopia uploader
This commit is contained in:
Shubham Pampattiwar
2023-12-22 10:47:32 -08:00
committed by GitHub
parent ee7b60f723 5ff8a4f2a3
commit 568e5bf04a
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/7247-Lyndon-Li Normal file
View File

@@ -0,0 +1 @@
Fix issue #7244. By the end of the upload, check the outstanding incomplete snapshots and delete them by calling ApplyRetentionPolicy

6
pkg/uploader/kopia/snapshot.go
View File

@@ -44,6 +44,7 @@ import (
)
// All function mainly used to make testing more convenient
var applyRetentionPolicyFunc = policy.ApplyRetentionPolicy
var treeForSourceFunc = policy.TreeForSource
var setPolicyFunc = policy.SetPolicy
var saveSnapshotFunc = snapshot.SaveSnapshot
@@ -277,6 +278,11 @@ func SnapshotSource(
return "", 0, errors.Wrapf(err, "Failed to save kopia manifest %v", manifest.ID)
}
_, err = applyRetentionPolicyFunc(ctx, rep, sourceInfo, true)
if err != nil {
return "", 0, errors.Wrapf(err, "Failed to apply kopia retention policy for si %v", sourceInfo)
}
if err = rep.Flush(ctx); err != nil {
return "", 0, errors.Wrapf(err, "Failed to flush kopia repository")
}

1
pkg/uploader/kopia/snapshot_test.go
View File

@@ -60,6 +60,7 @@ func injectSnapshotFuncs() *snapshotMockes {
repoWriterMock: &repomocks.RepositoryWriter{},
}
applyRetentionPolicyFunc = s.policyMock.ApplyRetentionPolicy
setPolicyFunc = s.policyMock.SetPolicy
treeForSourceFunc = s.policyMock.TreeForSource
loadSnapshotFunc = s.snapshotMock.LoadSnapshot