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

Use PackSize in checker

Browse source
This commit is contained in:
Alexander Weiss 2020-11-16 04:57:43 +01:00
parent 4960b841e6
commit a851c53cbe
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/checker/checker.go
View file

@ -178,13 +178,7 @@ func (c *Checker) LoadIndex(ctx context.Context) (hints []error, errs []error) {
c.masterIndex.MergeFinalIndexes() c.masterIndex.MergeFinalIndexes()
// compute pack size using index entries // compute pack size using index entries
for blob := range c.masterIndex.Each(ctx) { c.packs = c.masterIndex.PackSize(ctx, false)
size, ok := c.packs[blob.PackID]
if !ok {
size = pack.HeaderSize
}
c.packs[blob.PackID] = size + int64(pack.PackedSizeOfBlob(blob.Length))
}
debug.Log("checking for duplicate packs") debug.Log("checking for duplicate packs")
for packID := range c.packs { for packID := range c.packs {
@ -749,17 +743,17 @@ func checkPack(ctx context.Context, r restic.Repository, id restic.ID, size int6
return errors.Errorf("Pack size does not match, want %v, got %v", size, realSize) return errors.Errorf("Pack size does not match, want %v, got %v", size, realSize)
} }
blobs, _, err := pack.List(r.Key(), packfile, size) blobs, hdrSize, err := pack.List(r.Key(), packfile, size)
if err != nil { if err != nil {
return err return err
} }
var errs []error var errs []error
var buf []byte var buf []byte
sizeFromBlobs := int64(pack.HeaderSize) // pack size computed only from blob information sizeFromBlobs := uint(hdrSize)
idx := r.Index() idx := r.Index()
for i, blob := range blobs { for i, blob := range blobs {
sizeFromBlobs += int64(pack.PackedSizeOfBlob(blob.Length)) sizeFromBlobs += blob.Length
debug.Log(" check blob %d: %v", i, blob) debug.Log(" check blob %d: %v", i, blob)
buf = buf[:cap(buf)] buf = buf[:cap(buf)]
@ -809,7 +803,7 @@ func checkPack(ctx context.Context, r restic.Repository, id restic.ID, size int6
} }
} }
if sizeFromBlobs != size { if int64(sizeFromBlobs) != size {
debug.Log("Pack size does not match, want %v, got %v", size, sizeFromBlobs) debug.Log("Pack size does not match, want %v, got %v", size, sizeFromBlobs)
errs = append(errs, errors.Errorf("Pack size does not match, want %v, got %v", size, sizeFromBlobs)) errs = append(errs, errors.Errorf("Pack size does not match, want %v, got %v", size, sizeFromBlobs))
} }