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

repository: Handle errors correctly

Browse source
This commit is contained in:
Alexander Neumann 2016-08-28 22:18:02 +02:00
parent 038b63f7f7
commit 045f545085
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/restic/repository/repository.go
View file

@ -102,6 +102,7 @@ func (r *Repository) LoadBlob(id backend.ID, t pack.BlobType, plaintextBuf []byt
return nil, err return nil, err
} }
var lastError error
for _, blob := range blobs { for _, blob := range blobs {
debug.Log("Repo.LoadBlob", "id %v found: %v", id.Str(), blob) debug.Log("Repo.LoadBlob", "id %v found: %v", id.Str(), blob)
@ -115,32 +116,37 @@ func (r *Repository) LoadBlob(id backend.ID, t pack.BlobType, plaintextBuf []byt
n, err := r.be.Load(h, ciphertextBuf, int64(blob.Offset)) n, err := r.be.Load(h, ciphertextBuf, int64(blob.Offset))
if err != nil { if err != nil {
debug.Log("Repo.LoadBlob", "error loading blob %v: %v", blob, err) debug.Log("Repo.LoadBlob", "error loading blob %v: %v", blob, err)
fmt.Fprintf(os.Stderr, "error loading blob %v: %v", id, err) lastError = err
continue continue
} }
if uint(n) != blob.Length { if uint(n) != blob.Length {
debug.Log("Repo.LoadBlob", "error loading blob %v: wrong length returned, want %d, got %d", lastError = errors.Errorf("error loading blob %v: wrong length returned, want %d, got %d",
blob.Length, uint(n)) id.Str(), blob.Length, uint(n))
debug.Log("Repo.LoadBlob", "lastError: %v", lastError)
continue continue
} }
// decrypt // decrypt
plaintextBuf, err = r.decryptTo(plaintextBuf, ciphertextBuf) plaintextBuf, err = r.decryptTo(plaintextBuf, ciphertextBuf)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "decrypting blob %v failed: %v", id, err) lastError = errors.Errorf("decrypting blob %v failed: %v", id, err)
continue continue
} }
// check hash // check hash
if !backend.Hash(plaintextBuf).Equal(id) { if !backend.Hash(plaintextBuf).Equal(id) {
fmt.Fprintf(os.Stderr, "blob %v returned invalid hash", id) lastError = errors.Errorf("blob %v returned invalid hash", id)
continue continue
} }
return plaintextBuf, nil return plaintextBuf, nil
} }
if lastError != nil {
return nil, lastError
}
return nil, errors.Errorf("loading blob %v from %v packs failed", id.Str(), len(blobs)) return nil, errors.Errorf("loading blob %v from %v packs failed", id.Str(), len(blobs))
} }