lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-12 18:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ImageStore.prune() behavior to actually remove images (#420)

Browse Source 
- Fixes #417.

Rename `_prune()` to `cleanupOrphanedBlobs()` to clarify what it
actually does, and remove `prune()` method as we'll do all that logic in
container directly.
This commit is contained in:
Raj
2025-11-20 15:22:54 -08:00
committed by GitHub
parent 14f56e4a53
commit 860139bd1a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Containerization/Image/ImageStore/ImageStore.swift
+5 -6
View File
@@ -124,25 +124,25 @@ extension ImageStore {
try await self.lock.withLock { lockCtx in
try await self.referenceManager.delete(reference: reference)
if performCleanup {
try await self._prune(lockCtx)
try await self._cleanupOrphanedBlobs(lockCtx)
}
}
}
/// Perform a garbage collection in the underlying `ContentStore` that is managed by the `ImageStore`.
/// Clean up orphaned blobs that are no longer referenced by any image.
///
/// - Returns: Returns a tuple of `(deleted, freed)`.
/// `deleted` : A list of the names of the content items that were deleted from the `ContentStore`,
/// `freed` : The total size of the items that were deleted.
@discardableResult
public func prune() async throws -> (deleted: [String], freed: UInt64) {
public func cleanupOrphanedBlobs() async throws -> (deleted: [String], freed: UInt64) {
try await self.lock.withLock { lockCtx in
try await self._prune(lockCtx)
try await self._cleanupOrphanedBlobs(lockCtx)
}
}
@discardableResult
private func _prune(_ lock: AsyncLock.Context) async throws -> ([String], UInt64) {
private func _cleanupOrphanedBlobs(_ lock: AsyncLock.Context) async throws -> (deleted: [String], freed: UInt64) {
let images = try await self.list()
var referenced: [String] = []
for image in images {
@@ -150,7 +150,6 @@ extension ImageStore {
}
let (deleted, size) = try await self.contentStore.delete(keeping: referenced)
return (deleted, size)
}
/// Tag an existing image such that it can be referenced by another name.