diff --git a/internal/archiver/tree_saver.go b/internal/archiver/tree_saver.go index d25781b03..a7dae3873 100644 --- a/internal/archiver/tree_saver.go +++ b/internal/archiver/tree_saver.go @@ -105,14 +105,15 @@ func (s *TreeSaver) save(ctx context.Context, job *saveTreeJob) (*restic.Node, I continue } - debug.Log("insert %v", fnr.node.Name) err := builder.AddNode(fnr.node) if err != nil && errors.Is(err, restic.ErrTreeNotOrdered) && lastNode != nil && fnr.node.Equals(*lastNode) { + debug.Log("insert %v failed: %v", fnr.node.Name, err) // ignore error if an _identical_ node already exists, but nevertheless issue a warning _ = s.errFn(fnr.target, err) err = nil } if err != nil { + debug.Log("insert %v failed: %v", fnr.node.Name, err) return nil, stats, err } lastNode = fnr.node diff --git a/internal/restic/parallel.go b/internal/restic/parallel.go index df160f018..34a2a019c 100644 --- a/internal/restic/parallel.go +++ b/internal/restic/parallel.go @@ -41,7 +41,7 @@ func ParallelList(ctx context.Context, r Lister, t FileType, parallelism uint, f // a worker receives an index ID from ch, loads the index, and sends it to indexCh worker := func() error { for fi := range ch { - debug.Log("worker got file %v", fi.ID.Str()) + debug.Log("worker got file %v/%v", t, fi.ID.Str()) err := fn(ctx, fi.ID, fi.Size) if err != nil { return err diff --git a/internal/walker/rewriter.go b/internal/walker/rewriter.go index 6f063831e..cd05f69f5 100644 --- a/internal/walker/rewriter.go +++ b/internal/walker/rewriter.go @@ -37,7 +37,7 @@ func FilterTree(ctx context.Context, repo BlobLoadSaver, nodepath string, nodeID return restic.ID{}, err } if nodeID != testID { - return restic.ID{}, fmt.Errorf("cannot encode tree at %q without loosing information", nodepath) + return restic.ID{}, fmt.Errorf("cannot encode tree at %q without losing information", nodepath) } debug.Log("filterTree: %s, nodeId: %s\n", nodepath, nodeID.Str())