clitools/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-06-28 08:00:52 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3981 from MichaelEischer/prune-uncompressed-stats

Browse Source 
prune: report how much data must be repacked to compressed the repo
This commit is contained in:
Michael Eischer 2022-12-23 22:34:04 +01:00 committed by GitHub
commit 705cabb304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/restic/cmd_prune.go
View File

@ -214,13 +214,14 @@ type pruneStats struct {
repackrm uint repackrm uint
} }
size struct { size struct {
used uint64 used uint64
duplicate uint64 duplicate uint64
unused uint64 unused uint64
remove uint64 remove uint64
repack uint64 repack uint64
repackrm uint64 repackrm uint64
unref uint64 unref uint64
uncompressed uint64
} }
packs struct { packs struct {
used uint used uint
@ -497,13 +498,16 @@ func decidePackAction(ctx context.Context, opts PruneOptions, repo restic.Reposi
stats.packs.partlyUsed++ stats.packs.partlyUsed++
} }
if p.uncompressed {
stats.size.uncompressed += p.unusedSize + p.usedSize
}
mustCompress := false mustCompress := false
if repoVersion >= 2 { if repoVersion >= 2 {
// repo v2: always repack tree blobs if uncompressed // repo v2: always repack tree blobs if uncompressed
// compress data blobs if requested // compress data blobs if requested
mustCompress = (p.tpe == restic.TreeBlob || opts.RepackUncompressed) && p.uncompressed mustCompress = (p.tpe == restic.TreeBlob || opts.RepackUncompressed) && p.uncompressed
} }
// use a flag that pack must be compressed // use as flag that pack must be compressed
p.uncompressed = mustCompress p.uncompressed = mustCompress
// decide what to do // decide what to do
@ -602,6 +606,7 @@ func decidePackAction(ctx context.Context, opts PruneOptions, repo restic.Reposi
stats.size.repack += p.unusedSize + p.usedSize stats.size.repack += p.unusedSize + p.usedSize
stats.blobs.repackrm += p.unusedBlobs stats.blobs.repackrm += p.unusedBlobs
stats.size.repackrm += p.unusedSize stats.size.repackrm += p.unusedSize
stats.size.uncompressed -= p.unusedSize + p.usedSize
} }
// calculate limit for number of unused bytes in the repo after repacking // calculate limit for number of unused bytes in the repo after repacking
@ -633,6 +638,11 @@ func decidePackAction(ctx context.Context, opts PruneOptions, repo restic.Reposi
stats.packs.repack = uint(len(repackPacks)) stats.packs.repack = uint(len(repackPacks))
stats.packs.remove = uint(len(removePacks)) stats.packs.remove = uint(len(removePacks))
if repo.Config().Version < 2 {
// compression not supported for repository format version 1
stats.size.uncompressed = 0
}
return prunePlan{removePacksFirst: removePacksFirst, return prunePlan{removePacksFirst: removePacksFirst,
removePacks: removePacks, removePacks: removePacks,
repackPacks: repackPacks, repackPacks: repackPacks,
@ -661,6 +671,9 @@ func printPruneStats(stats pruneStats) error {
Verbosef("to delete: %10d blobs / %s\n", stats.blobs.remove, ui.FormatBytes(stats.size.remove+stats.size.unref)) Verbosef("to delete: %10d blobs / %s\n", stats.blobs.remove, ui.FormatBytes(stats.size.remove+stats.size.unref))
totalPruneSize := stats.size.remove + stats.size.repackrm + stats.size.unref totalPruneSize := stats.size.remove + stats.size.repackrm + stats.size.unref
Verbosef("total prune: %10d blobs / %s\n", stats.blobs.remove+stats.blobs.repackrm, ui.FormatBytes(totalPruneSize)) Verbosef("total prune: %10d blobs / %s\n", stats.blobs.remove+stats.blobs.repackrm, ui.FormatBytes(totalPruneSize))
if stats.size.uncompressed > 0 {
Verbosef("not yet compressed: %s\n", ui.FormatBytes(stats.size.uncompressed))
}
Verbosef("remaining: %10d blobs / %s\n", totalBlobs-(stats.blobs.remove+stats.blobs.repackrm), ui.FormatBytes(totalSize-totalPruneSize)) Verbosef("remaining: %10d blobs / %s\n", totalBlobs-(stats.blobs.remove+stats.blobs.repackrm), ui.FormatBytes(totalSize-totalPruneSize))
unusedAfter := unusedSize - stats.size.remove - stats.size.repackrm unusedAfter := unusedSize - stats.size.remove - stats.size.repackrm
Verbosef("unused size after prune: %s (%s of remaining size)\n", Verbosef("unused size after prune: %s (%s of remaining size)\n",