octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-30 00:33:57 +00:00
Code Issues Releases Wiki Activity

fsck: Check minimal set of blobs

Browse Source
This commit is contained in:
Alexander Neumann 2015-02-04 22:20:56 +01:00
parent d44eb9d794
commit 316e761f27
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/restic/cmd_fsck.go
View File

@ -88,6 +88,8 @@ func fsckTree(opts CmdFsck, s restic.Server, blob restic.Blob) error {
var firstErr error var firstErr error
seenIDs := backend.NewIDSet()
for i, node := range tree.Nodes { for i, node := range tree.Nodes {
if node.Name == "" { if node.Name == "" {
return fmt.Errorf("node %v of tree %v has no name", i, blob.ID) return fmt.Errorf("node %v of tree %v has no name", i, blob.ID)
@ -107,6 +109,11 @@ func fsckTree(opts CmdFsck, s restic.Server, blob restic.Blob) error {
return fmt.Errorf("file node %q of tree %v has no content", node.Name, blob.ID) return fmt.Errorf("file node %q of tree %v has no content", node.Name, blob.ID)
} }
// record ids
for _, id := range node.Content {
seenIDs.Insert(id)
}
bytes, err := fsckFile(opts, s, tree.Map, node.Content) bytes, err := fsckFile(opts, s, tree.Map, node.Content)
if err != nil { if err != nil {
return err return err
@ -117,7 +124,7 @@ func fsckTree(opts CmdFsck, s restic.Server, blob restic.Blob) error {
} }
case "dir": case "dir":
if node.Subtree == nil { if node.Subtree == nil {
return fmt.Errorf("dir node %q of tree %v has no subtree", node.Name, blob.ID) return fmt.Errorf("dir node %q of tree %v (storage id %v) has no subtree", node.Name, blob.ID, blob.Storage)
} }
// lookup blob // lookup blob
@ -127,6 +134,9 @@ func fsckTree(opts CmdFsck, s restic.Server, blob restic.Blob) error {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
} }
// record id
seenIDs.Insert(node.Subtree)
err = fsckTree(opts, s, subtreeBlob) err = fsckTree(opts, s, subtreeBlob)
if err != nil { if err != nil {
firstErr = err firstErr = err
@ -135,6 +145,13 @@ func fsckTree(opts CmdFsck, s restic.Server, blob restic.Blob) error {
} }
} }
// check map for unused ids
for _, id := range tree.Map.IDs() {
if seenIDs.Find(id) != nil {
return fmt.Errorf("tree %v: map contains unused ID %v", blob.ID, id)
}
}
return firstErr return firstErr
} }
@ -147,7 +164,7 @@ func fsck_snapshot(opts CmdFsck, s restic.Server, id backend.ID) error {
} }
if !sn.Tree.Valid() { if !sn.Tree.Valid() {
return fmt.Errorf("snapshot %v has invalid tree %v", sn.ID, sn.Tree) return fmt.Errorf("snapshot %s has invalid tree %v", sn.ID(), sn.Tree)
} }
err = fsckTree(opts, s, sn.Tree) err = fsckTree(opts, s, sn.Tree)