Fix tart prune --cache-budget logic (#272)

This commit is contained in:
Nikolay Edigaryev 2022-10-14 01:43:37 +04:00 committed by GitHub
parent 667de2a199
commit c67efb88f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions

View File

@ -63,21 +63,25 @@ struct Prune: AsyncParsableCommand {
let prunableStorages: [PrunableStorage] = [VMStorageOCI(), try IPSWCache()]
let prunables: [Prunable] = try prunableStorages
.flatMap { try $0.prunables() }
.sorted { try $0.accessDate() < $1.accessDate() }
.sorted { try $0.accessDate() > $1.accessDate() }
let cacheUsedBytes = try prunables.map { try $0.sizeBytes() }.reduce(0, +)
var cacheReclaimedBytes: Int = 0
var cacheBudgetBytes = cacheBudgetBytes
var prunablesToDelete: [Prunable] = []
var it = prunables.makeIterator()
for prunable in prunables {
let prunableSizeBytes = UInt64(try prunable.sizeBytes())
while (cacheUsedBytes - cacheReclaimedBytes) > cacheBudgetBytes {
guard let prunable = it.next() else {
break
if prunableSizeBytes <= cacheBudgetBytes {
// Don't mark for deletion as
// there's a budget available
cacheBudgetBytes -= prunableSizeBytes
} else {
// Mark for deletion
prunablesToDelete.append(prunable)
}
cacheReclaimedBytes -= try prunable.sizeBytes()
try prunable.delete()
}
try prunablesToDelete.forEach { try $0.delete() }
}
static func pruneReclaim(reclaimBytes: UInt64) throws {