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

debug: check arguments and cleanup error handling

Browse Source
This commit is contained in:
Michael Eischer 2021-03-10 20:41:11 +01:00
parent 096f15db5c
commit 6774fc6454
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cmd/restic/cmd_debug.go
View File

@ -313,13 +313,13 @@ func decryptUnsigned(ctx context.Context, k *crypto.Key, buf []byte) []byte {
return out return out
} }
func loadBlobs(ctx context.Context, repo restic.Repository, pack string, list []restic.Blob) error { func loadBlobs(ctx context.Context, repo restic.Repository, pack restic.ID, list []restic.Blob) error {
be := repo.Backend() be := repo.Backend()
for _, blob := range list { for _, blob := range list {
fmt.Printf(" loading blob %v at %v (length %v)\n", blob.ID, blob.Offset, blob.Length) fmt.Printf(" loading blob %v at %v (length %v)\n", blob.ID, blob.Offset, blob.Length)
buf := make([]byte, blob.Length) buf := make([]byte, blob.Length)
h := restic.Handle{ h := restic.Handle{
Name: pack, Name: pack.String(),
Type: restic.PackFile, Type: restic.PackFile,
} }
err := be.Load(ctx, h, int(blob.Length), int64(blob.Offset), func(rd io.Reader) error { err := be.Load(ctx, h, int(blob.Length), int64(blob.Offset), func(rd io.Reader) error {
@ -408,6 +408,20 @@ func storePlainBlob(id restic.ID, prefix string, plain []byte) error {
} }
func runDebugExamine(gopts GlobalOptions, args []string) error { func runDebugExamine(gopts GlobalOptions, args []string) error {
ids := make([]restic.ID, 0)
for _, name := range args {
id, err := restic.ParseID(name)
if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
continue
}
ids = append(ids, id)
}
if len(ids) == 0 {
return errors.Fatal("no pack files to examine")
}
repo, err := OpenRepository(gopts) repo, err := OpenRepository(gopts)
if err != nil { if err != nil {
return err return err
@ -426,34 +440,34 @@ func runDebugExamine(gopts GlobalOptions, args []string) error {
return err return err
} }
for _, name := range args { for _, id := range ids {
examinePack(gopts.ctx, repo, name) err := examinePack(gopts.ctx, repo, id)
if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
}
if err == context.Canceled {
break
}
} }
return nil return nil
} }
func examinePack(ctx context.Context, repo restic.Repository, name string) { func examinePack(ctx context.Context, repo restic.Repository, id restic.ID) error {
blobsLoaded := false fmt.Printf("examine %v\n", id)
fmt.Printf("examine %v\n", name)
id, err := restic.ParseID(name)
if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
}
h := restic.Handle{ h := restic.Handle{
Type: restic.PackFile, Type: restic.PackFile,
Name: name, Name: id.String(),
} }
fi, err := repo.Backend().Stat(ctx, h) fi, err := repo.Backend().Stat(ctx, h)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) return err
} }
fmt.Printf(" file size is %v\n", fi.Size) fmt.Printf(" file size is %v\n", fi.Size)
buf, err := backend.LoadAll(ctx, nil, repo.Backend(), h) buf, err := backend.LoadAll(ctx, nil, repo.Backend(), h)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) return err
} }
gotID := restic.Hash(buf) gotID := restic.Hash(buf)
@ -466,6 +480,7 @@ func examinePack(ctx context.Context, repo restic.Repository, name string) {
fmt.Printf(" ========================================\n") fmt.Printf(" ========================================\n")
fmt.Printf(" looking for info in the indexes\n") fmt.Printf(" looking for info in the indexes\n")
blobsLoaded := false
// examine all data the indexes have for the pack file // examine all data the indexes have for the pack file
for _, idx := range repo.Index().(*repository.MasterIndex).All() { for _, idx := range repo.Index().(*repository.MasterIndex).All() {
idxIDs, err := idx.IDs() idxIDs, err := idx.IDs()
@ -513,7 +528,7 @@ func examinePack(ctx context.Context, repo restic.Repository, name string) {
list = append(list, b.Blob) list = append(list, b.Blob)
} }
err = loadBlobs(ctx, repo, name, list) err = loadBlobs(ctx, repo, id, list)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err) fmt.Fprintf(os.Stderr, "error: %v\n", err)
} else { } else {
@ -526,8 +541,7 @@ func examinePack(ctx context.Context, repo restic.Repository, name string) {
blobs, _, err := pack.List(repo.Key(), restic.ReaderAt(ctx, repo.Backend(), h), fi.Size) blobs, _, err := pack.List(repo.Key(), restic.ReaderAt(ctx, repo.Backend(), h), fi.Size)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error for pack %v: %v\n", id.Str(), err) return fmt.Errorf("pack %v: %v", id.Str(), err)
return
} }
// track current size and offset // track current size and offset
@ -558,9 +572,7 @@ func examinePack(ctx context.Context, repo restic.Repository, name string) {
} }
if !blobsLoaded { if !blobsLoaded {
err = loadBlobs(ctx, repo, name, blobs) return loadBlobs(ctx, repo, id, blobs)
if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
}
} }
return nil
} }