Minor log fixups for snapshots (#4113)
* Fix log message during hierarchy merging so it's not as confusing * add reason for making a snapshot. This can be used to separate out later messages into item data snapshot and details snapshot during debugging --- #### 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
e96c21d342
commit
533ba59f35
@ -877,8 +877,8 @@ func traverseBaseDir(
|
|||||||
stats *count.Bus,
|
stats *count.Bus,
|
||||||
) error {
|
) error {
|
||||||
ctx = clues.Add(ctx,
|
ctx = clues.Add(ctx,
|
||||||
"old_dir_path", oldDirPath,
|
"old_parent_dir_path", oldDirPath,
|
||||||
"expected_dir_path", expectedDirPath)
|
"expected_parent_dir_path", expectedDirPath)
|
||||||
|
|
||||||
if depth >= maxInflateTraversalDepth {
|
if depth >= maxInflateTraversalDepth {
|
||||||
return clues.New("base snapshot tree too tall").WithClues(ctx)
|
return clues.New("base snapshot tree too tall").WithClues(ctx)
|
||||||
|
|||||||
@ -492,7 +492,10 @@ func consumeBackupCollections(
|
|||||||
isIncremental bool,
|
isIncremental bool,
|
||||||
errs *fault.Bus,
|
errs *fault.Bus,
|
||||||
) (*kopia.BackupStats, *details.Builder, kopia.DetailsMergeInfoer, error) {
|
) (*kopia.BackupStats, *details.Builder, kopia.DetailsMergeInfoer, error) {
|
||||||
ctx = clues.Add(ctx, "collection_source", "operations")
|
ctx = clues.Add(
|
||||||
|
ctx,
|
||||||
|
"collection_source", "operations",
|
||||||
|
"snapshot_type", "item data")
|
||||||
|
|
||||||
progressBar := observe.MessageWithCompletion(ctx, "Backing up data")
|
progressBar := observe.MessageWithCompletion(ctx, "Backing up data")
|
||||||
defer close(progressBar)
|
defer close(progressBar)
|
||||||
|
|||||||
@ -61,6 +61,8 @@ func (ss *storeStreamer) Collect(ctx context.Context, col Collectable) error {
|
|||||||
|
|
||||||
// Write persists the collected objects in the stream store
|
// Write persists the collected objects in the stream store
|
||||||
func (ss *storeStreamer) Write(ctx context.Context, errs *fault.Bus) (string, error) {
|
func (ss *storeStreamer) Write(ctx context.Context, errs *fault.Bus) (string, error) {
|
||||||
|
ctx = clues.Add(ctx, "snapshot_type", "stream store")
|
||||||
|
|
||||||
id, err := write(ctx, ss.kw, ss.dbcs, errs)
|
id, err := write(ctx, ss.kw, ss.dbcs, errs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", clues.Wrap(err, "writing to stream store")
|
return "", clues.Wrap(err, "writing to stream store")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user