From c265673c8efbd861a21a0995094d3948e1db4571 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 10 Dec 2016 11:49:09 +0100 Subject: [PATCH] Save snapshot after saving all pack files Closes #686 --- src/restic/archiver/archiver.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/restic/archiver/archiver.go b/src/restic/archiver/archiver.go index 8ef1814d3..187310ffb 100644 --- a/src/restic/archiver/archiver.go +++ b/src/restic/archiver/archiver.go @@ -727,19 +727,6 @@ func (arch *Archiver) Snapshot(p *restic.Progress, paths, tags []string, parentI debug.Log("workers terminated") - // receive the top-level tree - root := (<-resCh).(*restic.Node) - debug.Log("root node received: %v", root.Subtree.Str()) - sn.Tree = root.Subtree - - // save snapshot - id, err := arch.repo.SaveJSONUnpacked(restic.SnapshotFile, sn) - if err != nil { - return nil, restic.ID{}, err - } - - debug.Log("saved snapshot %v", id.Str()) - // flush repository err = arch.repo.Flush() if err != nil { @@ -755,6 +742,19 @@ func (arch *Archiver) Snapshot(p *restic.Progress, paths, tags []string, parentI debug.Log("saved indexes") + // receive the top-level tree + root := (<-resCh).(*restic.Node) + debug.Log("root node received: %v", root.Subtree.Str()) + sn.Tree = root.Subtree + + // save snapshot + id, err := arch.repo.SaveJSONUnpacked(restic.SnapshotFile, sn) + if err != nil { + return nil, restic.ID{}, err + } + + debug.Log("saved snapshot %v", id.Str()) + return sn, id, nil }