这是indexloc提供的服务，不要输入任何密码
Skip to content

tart push: re-try when encountering errors when pushing disk layers #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2024
Merged

tart push: re-try when encountering errors when pushing disk layers #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca8ad0
tart push: re-try when encountering errors when pushing disk layers
edigaryev Aug 9, 2024
4191fef
Only re-try on URLError
edigaryev Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions Sources/tart/OCI/Layerizer/DiskV2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Foundation
import Compression
import System
import Retry

class DiskV2: Disk {
private static let bufferSizeBytes = 4 * 1024 * 1024
Expand Down Expand Up @@ -28,8 +29,19 @@ class DiskV2: Disk {
let compressedData = try (data as NSData).compressed(using: .lz4) as Data
let compressedDataDigest = Digest.hash(compressedData)

if try await !registry.blobExists(compressedDataDigest) {
_ = try await registry.pushBlob(fromData: compressedData, chunkSizeMb: chunkSizeMb, digest: compressedDataDigest)
try await retry(maxAttempts: 5, backoff: .exponentialWithFullJitter(baseDelay: .seconds(5), maxDelay: .seconds(60))) {
if try await !registry.blobExists(compressedDataDigest) {
_ = try await registry.pushBlob(fromData: compressedData, chunkSizeMb: chunkSizeMb, digest: compressedDataDigest)
}
} recoverFromFailure: { error in
if error is URLError {
print("Error: \(error.localizedDescription)")
print("Attempting to re-try...")

return .retry
}

return .throw
}

// Update progress using a relative value
Expand Down
12 changes: 6 additions & 6 deletions Sources/tart/VMStorageOCI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,14 @@ class VMStorageOCI: PrunableStorage {

try await tmpVMDir.pullFromRegistry(registry: registry, manifest: manifest, concurrency: concurrency, localLayerCache: localLayerCache)
} recoverFromFailure: { error in
if error is RuntimeError {
return .throw
}
if error is Retryable {
print("Error: \(error.localizedDescription)")
print("Attempting to re-try...")

print("Error: \(error.localizedDescription)")
print("Attempting to re-try...")
return .retry
}

return .retry
return .throw
}
try move(digestName, from: tmpVMDir)
transaction.finish()
Expand Down