amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-04-28 07:19:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1036 from restic/prune-remove-invalid-files

Browse Source 
prune: Remove invalid files
This commit is contained in:
Alexander Neumann
2017-06-16 22:52:44 +02:00
parent e074833a7d 1baaa778ee
commit c4592f577a
6 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmds/restic/cmd_prune.go
View File

@@ -106,11 +106,15 @@ func pruneRepository(gopts GlobalOptions, repo restic.Repository) error {
Verbosef("building new index for repo\n")
bar := newProgressMax(!gopts.Quiet, uint64(stats.packs), "packs")
idx, err := index.New(ctx, repo, restic.NewIDSet(), bar)
idx, invalidFiles, err := index.New(ctx, repo, restic.NewIDSet(), bar)
if err != nil {
return err
}
for _, id := range invalidFiles {
Warnf("incomplete pack file (will be removed): %v\n", id)
}
blobs := 0
for _, pack := range idx.Packs {
stats.bytes += pack.Size
@@ -196,6 +200,12 @@ func pruneRepository(gopts GlobalOptions, repo restic.Repository) error {
// find packs that are unneeded
removePacks := restic.NewIDSet()
Verbosef("will remove %d invalid files\n", len(invalidFiles))
for _, id := range invalidFiles {
removePacks.Insert(id)
}
for packID, p := range idx.Packs {
hasActiveBlob := false

2
src/cmds/restic/cmd_rebuild_index.go
View File

@@ -50,7 +50,7 @@ func rebuildIndex(ctx context.Context, repo restic.Repository, ignorePacks resti
}
bar := newProgressMax(!globalOptions.Quiet, packs-uint64(len(ignorePacks)), "packs")
idx, err := index.New(ctx, repo, ignorePacks, bar)
idx, _, err := index.New(ctx, repo, ignorePacks, bar)
if err != nil {
return err
}