Mark all folders we're not keeping as tombstoned (#4177)
Increase the number of folders that we tombstone so that we only keep the things that were explicitly requested for the backup. This also helps keep things consistent since we only add folders to the previous paths and previous deltas maps if they were selected during the backup --- #### Does this PR need a docs update or release note? - [ ] ✅ Yes, it's included - [ ] 🕐 Yes, but in a later PR - [x] ⛔ No #### Type of change - [ ] 🌻 Feature - [x] 🐛 Bugfix - [ ] 🗺️ Documentation - [ ] 🤖 Supportability/Tests - [ ] 💻 CI/Deployment - [ ] 🧹 Tech Debt/Cleanup #### Issue(s) * #4175 #### Test Plan - [x] 💪 Manual - [ ] ⚡ Unit test - [ ] 💚 E2E
This commit is contained in:
parent
8d2070409f
commit
82f1679cb8
@ -124,7 +124,6 @@ func populateCollections(
|
|||||||
}
|
}
|
||||||
|
|
||||||
cID := ptr.Val(c.GetId())
|
cID := ptr.Val(c.GetId())
|
||||||
delete(tombstones, cID)
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
@ -148,6 +147,8 @@ func populateCollections(
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete(tombstones, cID)
|
||||||
|
|
||||||
if len(prevPathStr) > 0 {
|
if len(prevPathStr) > 0 {
|
||||||
if prevPath, err = pathFromPrevString(prevPathStr); err != nil {
|
if prevPath, err = pathFromPrevString(prevPathStr); err != nil {
|
||||||
logger.CtxErr(ictx, err).Error("parsing prev path")
|
logger.CtxErr(ictx, err).Error("parsing prev path")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user