mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-26 09:47:49 +00:00
Code Issues Releases Wiki Activity

copy: Only process each tree once

Browse source 
This speeds up copying multiple overlapping snapshots from one
repository to another, as we only have to copy the changed parts of
later snapshots.
This commit is contained in:
Michael Eischer 2020-08-22 12:22:00 +02:00
parent 908b23fda0
commit b0a8c4ad6c
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmd/restic/cmd_copy.go
View file

@ -108,11 +108,13 @@ func runCopy(opts CopyOptions, gopts GlobalOptions, args []string) error {
return err return err
} }
visitedTrees := restic.NewIDSet()
for sn := range FindFilteredSnapshots(ctx, srcRepo, opts.Hosts, opts.Tags, opts.Paths, args) { for sn := range FindFilteredSnapshots(ctx, srcRepo, opts.Hosts, opts.Tags, opts.Paths, args) {
Verbosef("snapshot %s of %v at %s)\n", sn.ID().Str(), sn.Paths, sn.Time) Verbosef("snapshot %s of %v at %s)\n", sn.ID().Str(), sn.Paths, sn.Time)
Verbosef(" copy started, this may take a while...\n") Verbosef(" copy started, this may take a while...\n")
if err := copyTree(ctx, srcRepo, dstRepo, *sn.Tree); err != nil { if err := copyTree(ctx, srcRepo, dstRepo, *sn.Tree, visitedTrees); err != nil {
return err return err
} }
debug.Log("tree copied") debug.Log("tree copied")
@ -134,11 +136,18 @@ func runCopy(opts CopyOptions, gopts GlobalOptions, args []string) error {
return nil return nil
} }
func copyTree(ctx context.Context, srcRepo, dstRepo restic.Repository, treeID restic.ID) error { func copyTree(ctx context.Context, srcRepo, dstRepo restic.Repository, treeID restic.ID, visitedTrees restic.IDSet) error {
// We have already processed this tree
if visitedTrees.Has(treeID) {
return nil
}
tree, err := srcRepo.LoadTree(ctx, treeID) tree, err := srcRepo.LoadTree(ctx, treeID)
if err != nil { if err != nil {
return fmt.Errorf("LoadTree(%v) returned error %v", treeID.Str(), err) return fmt.Errorf("LoadTree(%v) returned error %v", treeID.Str(), err)
} }
visitedTrees.Insert(treeID)
// Do we already have this tree blob? // Do we already have this tree blob?
if !dstRepo.Index().Has(treeID, restic.TreeBlob) { if !dstRepo.Index().Has(treeID, restic.TreeBlob) {
newTreeID, err := dstRepo.SaveTree(ctx, tree) newTreeID, err := dstRepo.SaveTree(ctx, tree)
@ -157,7 +166,7 @@ func copyTree(ctx context.Context, srcRepo, dstRepo restic.Repository, treeID re
for _, entry := range tree.Nodes { for _, entry := range tree.Nodes {
// If it is a directory, recurse // If it is a directory, recurse
if entry.Type == "dir" && entry.Subtree != nil { if entry.Type == "dir" && entry.Subtree != nil {
if err := copyTree(ctx, srcRepo, dstRepo, *entry.Subtree); err != nil { if err := copyTree(ctx, srcRepo, dstRepo, *entry.Subtree, visitedTrees); err != nil {
return err return err
} }
} }