Update log statements for base finder (#4588)
Store more info in the context so that log statements need to add fewer additional fields. --- #### 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 - [ ] 🐛 Bugfix - [ ] 🗺️ Documentation - [ ] 🤖 Supportability/Tests - [ ] 💻 CI/Deployment - [x] 🧹 Tech Debt/Cleanup #### Test Plan - [x] 💪 Manual - [ ] ⚡ Unit test - [ ] 💚 E2E
This commit is contained in:
parent
29d4e5a328
commit
cd75ec7e4b
@ -183,19 +183,20 @@ func (b *baseFinder) findBasesInSet(
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ictx = clues.Add(ictx, "search_backup_id", bup.ID)
|
||||||
|
|
||||||
ssid := bup.StreamStoreID
|
ssid := bup.StreamStoreID
|
||||||
if len(ssid) == 0 {
|
if len(ssid) == 0 {
|
||||||
ssid = bup.DetailsID
|
ssid = bup.DetailsID
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(ssid) == 0 {
|
if len(ssid) == 0 {
|
||||||
logger.Ctx(ictx).Debugw(
|
logger.Ctx(ictx).Debug("empty backup stream store ID")
|
||||||
"empty backup stream store ID",
|
|
||||||
"search_backup_id", bup.ID)
|
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ictx = clues.Add(ictx, "ssid", ssid)
|
||||||
|
|
||||||
// If we've made it to this point then we're considering the backup
|
// If we've made it to this point then we're considering the backup
|
||||||
// complete as it has both an item data snapshot and a backup details
|
// complete as it has both an item data snapshot and a backup details
|
||||||
// snapshot.
|
// snapshot.
|
||||||
@ -215,21 +216,14 @@ func (b *baseFinder) findBasesInSet(
|
|||||||
Reasons: []identity.Reasoner{reason},
|
Reasons: []identity.Reasoner{reason},
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Ctx(ictx).Infow(
|
logger.Ctx(ictx).Info("found assist base")
|
||||||
"found assist base",
|
|
||||||
"search_backup_id", bup.ID,
|
|
||||||
"search_snapshot_id", meta.ID,
|
|
||||||
"ssid", ssid)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip if an assist base has already been selected.
|
// Skip if an assist base has already been selected.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Ctx(ictx).Infow("found merge base",
|
logger.Ctx(ictx).Info("found merge base")
|
||||||
"search_backup_id", bup.ID,
|
|
||||||
"search_snapshot_id", meta.ID,
|
|
||||||
"ssid", ssid)
|
|
||||||
|
|
||||||
mergeBase = &BackupBase{
|
mergeBase = &BackupBase{
|
||||||
Backup: bup,
|
Backup: bup,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user