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

Do not repack blobs that shouldn't be kept

Browse source
This commit is contained in:
Alexander Neumann 2016-05-11 22:43:56 +02:00
parent fa26ecc8f9
commit 122a0944a6
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/restic/repository/prune.go
View file

@ -25,6 +25,10 @@ func Repack(repo *Repository, packs, keepBlobs backend.IDSet) error {
debug.Log("Repack", "processing pack %v, blobs: %v", packID.Str(), list)
for _, blob := range list {
if !keepBlobs.Has(blob.ID) {
continue
}
buf, err = repo.LoadBlob(blob.Type, blob.ID, buf)
if err != nil {
return err

29
src/restic/repository/prune_test.go
View file

@ -55,12 +55,14 @@ func createRandomBlobs(t *testing.T, repo *Repository, blobs int, pData float32)
}
}
// selectBlobs returns a list of random blobs from the repository with probability p.
func selectBlobs(t *testing.T, repo *Repository, p float32) backend.IDSet {
// selectBlobs splits the list of all blobs randomly into two lists. A blob
// will be contained in the firstone ith probability p.
func selectBlobs(t *testing.T, repo *Repository, p float32) (list1, list2 backend.IDSet) {
done := make(chan struct{})
defer close(done)
blobs := backend.NewIDSet()
list1 = backend.NewIDSet()
list2 = backend.NewIDSet()
for id := range repo.List(backend.Data, done) {
entries, err := repo.ListPack(id)
@ -70,12 +72,14 @@ func selectBlobs(t *testing.T, repo *Repository, p float32) backend.IDSet {
for _, entry := range entries {
if rand.Float32() <= p {
blobs.Insert(entry.ID)
list1.Insert(entry.ID)
} else {
list2.Insert(entry.ID)
}
}
}
return blobs
return list1, list2
}
func listPacks(t *testing.T, repo *Repository) backend.IDSet {
@ -152,10 +156,11 @@ func TestRepack(t *testing.T) {
saveIndex(t, repo)
blobs := selectBlobs(t, repo, 0.2)
packs := findPacksForBlobs(t, repo, blobs)
removeBlobs, keepBlobs := selectBlobs(t, repo, 0.2)
repack(t, repo, packs, blobs)
packs := findPacksForBlobs(t, repo, keepBlobs)
repack(t, repo, packs, keepBlobs)
rebuildIndex(t, repo)
reloadIndex(t, repo)
@ -167,7 +172,7 @@ func TestRepack(t *testing.T) {
}
idx := repo.Index()
for id := range blobs {
for id := range keepBlobs {
pb, err := idx.Lookup(id)
if err != nil {
t.Errorf("unable to find blob %v in repo", id.Str())
@ -177,4 +182,10 @@ func TestRepack(t *testing.T) {
t.Errorf("lookup returned pack ID %v that should've been removed", pb.PackID)
}
}
for id := range removeBlobs {
if _, err := idx.Lookup(id); err == nil {
t.Errorf("blob %v still contained in the repo", id.Str())
}
}
}