octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-10 15:21:03 +00:00
Code Issues Releases Wiki Activity

fsck: more verbose error messages

Browse Source
This commit is contained in:
Alexander Neumann 2015-01-05 20:38:49 +01:00
parent 77c421b940
commit 4b070358ef
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/restic/cmd_fsck.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"errors" "errors"
"fmt" "fmt"
"os"
"github.com/restic/restic" "github.com/restic/restic"
"github.com/restic/restic/backend" "github.com/restic/restic/backend"
@ -12,7 +13,7 @@ type CmdFsck struct {
CheckData bool ` long:"check-data" description:"Read data blobs" default:"false"` CheckData bool ` long:"check-data" description:"Read data blobs" default:"false"`
Snapshot string `short:"s" long:"snapshot" description:"Only check this snapshot"` Snapshot string `short:"s" long:"snapshot" description:"Only check this snapshot"`
Orphaned bool `short:"o" long:"orphaned" description:"Check for orphaned blobs"` Orphaned bool `short:"o" long:"orphaned" description:"Check for orphaned blobs"`
RemoveOrphaned bool `short:"x" long:"remove-orphaned" description:"Remove orphaned blobs (implies -o)"` RemoveOrphaned bool `short:"r" long:"remove-orphaned" description:"Remove orphaned blobs (implies -o)"`
// lists checking for orphaned blobs // lists checking for orphaned blobs
o_data *restic.BlobList o_data *restic.BlobList
@ -88,6 +89,8 @@ func fsckTree(opts CmdFsck, ch *restic.ContentHandler, id backend.ID) error {
opts.o_trees.Insert(restic.Blob{ID: sid}) opts.o_trees.Insert(restic.Blob{ID: sid})
} }
var firstErr error
for i, node := range tree { for i, node := range tree {
if node.Name == "" { if node.Name == "" {
return fmt.Errorf("node %v of tree %v has no name", i, id) return fmt.Errorf("node %v of tree %v has no name", i, id)
@ -114,12 +117,13 @@ func fsckTree(opts CmdFsck, ch *restic.ContentHandler, id backend.ID) error {
err := fsckTree(opts, ch, node.Subtree) err := fsckTree(opts, ch, node.Subtree)
if err != nil { if err != nil {
return err firstErr = err
fmt.Fprintf(os.Stderr, "%v\n", err)
} }
} }
} }
return nil return firstErr
} }
func fsck_snapshot(opts CmdFsck, s restic.Server, id backend.ID) error { func fsck_snapshot(opts CmdFsck, s restic.Server, id backend.ID) error {
@ -172,7 +176,12 @@ func (cmd CmdFsck) Execute(args []string) error {
return fmt.Errorf("invalid id %q: %v", cmd.Snapshot, err) return fmt.Errorf("invalid id %q: %v", cmd.Snapshot, err)
} }
return fsck_snapshot(cmd, s, snapshotID) err = fsck_snapshot(cmd, s, snapshotID)
if err != nil {
fmt.Fprintf(os.Stderr, "check for snapshot %v failed\n", snapshotID)
}
return err
} }
if cmd.Orphaned { if cmd.Orphaned {
@ -187,16 +196,17 @@ func (cmd CmdFsck) Execute(args []string) error {
return err return err
} }
var firstErr error
for _, snapshotID := range list { for _, snapshotID := range list {
err := fsck_snapshot(cmd, s, snapshotID) err := fsck_snapshot(cmd, s, snapshotID)
if err != nil { if err != nil {
return err fmt.Fprintf(os.Stderr, "check for snapshot %v failed\n", snapshotID)
firstErr = err
} }
} }
if !cmd.Orphaned { if !cmd.Orphaned {
return nil return firstErr
} }
debug("starting orphaned check\n") debug("starting orphaned check\n")
@ -236,5 +246,5 @@ func (cmd CmdFsck) Execute(args []string) error {
} }
} }
return nil return firstErr
} }