alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Reuse buffer in Restorer.VerifyFiles

Browse source 
Time to verify a 2GB snapshot down from 11.568s to 9.726s (-16%).
This commit is contained in:
greatroar 2020-02-20 22:43:56 +01:00 committed by Michael Eischer
parent 92ae951ffa
commit 556424d61b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/restorer/restorer.go
View file

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/restic/chunker"
"github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/errors"
"github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/debug"
@ -316,8 +317,11 @@ func (res *Restorer) Snapshot() *restic.Snapshot {
// including the file(s) that caused errors. // including the file(s) that caused errors.
func (res *Restorer) VerifyFiles(ctx context.Context, dst string) (int, error) { func (res *Restorer) VerifyFiles(ctx context.Context, dst string) (int, error) {
// TODO multithreaded? // TODO multithreaded?
var (
buf = make([]byte, 0, chunker.MaxSize)
count = 0
)
count := 0
_, err := res.traverseTree(ctx, dst, string(filepath.Separator), *res.sn.Tree, treeVisitor{ _, err := res.traverseTree(ctx, dst, string(filepath.Separator), *res.sn.Tree, treeVisitor{
enterDir: func(node *restic.Node, target, location string) error { return nil }, enterDir: func(node *restic.Node, target, location string) error { return nil },
visitNode: func(node *restic.Node, target, location string) error { visitNode: func(node *restic.Node, target, location string) error {
@ -342,7 +346,7 @@ func (res *Restorer) VerifyFiles(ctx context.Context, dst string) (int, error) {
offset := int64(0) offset := int64(0)
for _, blobID := range node.Content { for _, blobID := range node.Content {
length, _ := res.repo.LookupBlobSize(blobID, restic.DataBlob) length, _ := res.repo.LookupBlobSize(blobID, restic.DataBlob)
buf := make([]byte, length) // TODO do I want to reuse the buffer somehow? buf = buf[:length]
_, err = file.ReadAt(buf, offset) _, err = file.ReadAt(buf, offset)
if err != nil { if err != nil {
_ = file.Close() _ = file.Close()