Add --max-concurrent-downloads flag for parallel layer downloads #716
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -214,5 +214,8 @@ public struct Flags { | |
|
|
||
| @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type")) | ||
| public var progress: ProgressType = .ansi | ||
|
|
||
| @Option(name: .long, help: "Maximum number of concurrent layer downloads (default: 3)") | ||
|
Contributor
There was a problem hiding this comment. @adityaramani Should we use the word "layer" or "blob" here? |
||
| public var maxConcurrentDownloads: Int = 3 | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| #!/usr/bin/env swift | ||
|
Contributor
There was a problem hiding this comment. Why is this and test_parameter_flow.swift in the top level directory?
Author
There was a problem hiding this comment. should they belong in Tests/CLITests/Subcommands/Images/?
Contributor
There was a problem hiding this comment. Yes, this might be a good place for the tests.
dkovba marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| import Foundation | ||
|
|
||
| func testConcurrentDownloads() async throws { | ||
| print("Testing concurrent download behavior...\n") | ||
|
|
||
| // Track concurrent task count | ||
| actor ConcurrencyTracker { | ||
| var currentCount = 0 | ||
| var maxObservedCount = 0 | ||
| var completedTasks = 0 | ||
|
|
||
| func taskStarted() { | ||
| currentCount += 1 | ||
| maxObservedCount = max(maxObservedCount, currentCount) | ||
| } | ||
|
|
||
| func taskCompleted() { | ||
| currentCount -= 1 | ||
| completedTasks += 1 | ||
| } | ||
|
|
||
| func getStats() -> (max: Int, completed: Int) { | ||
| return (maxObservedCount, completedTasks) | ||
| } | ||
|
|
||
| func reset() { | ||
| currentCount = 0 | ||
| maxObservedCount = 0 | ||
| completedTasks = 0 | ||
| } | ||
| } | ||
|
|
||
| let tracker = ConcurrencyTracker() | ||
|
|
||
| // Test with different concurrency limits | ||
| for maxConcurrent in [1, 3, 6] { | ||
| await tracker.reset() | ||
|
|
||
| // Simulate downloading 20 layers | ||
| let layerCount = 20 | ||
| let layers = Array(0..<layerCount) | ||
|
|
||
| print("Testing maxConcurrent=\(maxConcurrent) with \(layerCount) layers...") | ||
|
|
||
| let startTime = Date() | ||
|
|
||
| try await withThrowingTaskGroup(of: Void.self) { group in | ||
| var iterator = layers.makeIterator() | ||
|
|
||
| // Start initial batch based on maxConcurrent | ||
| for _ in 0..<maxConcurrent { | ||
| if iterator.next() != nil { | ||
| group.addTask { | ||
| await tracker.taskStarted() | ||
| try await Task.sleep(nanoseconds: 10_000_000) | ||
| await tracker.taskCompleted() | ||
| } | ||
| } | ||
| } | ||
| for try await _ in group { | ||
| if iterator.next() != nil { | ||
| group.addTask { | ||
| await tracker.taskStarted() | ||
| try await Task.sleep(nanoseconds: 10_000_000) | ||
| await tracker.taskCompleted() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let duration = Date().timeIntervalSince(startTime) | ||
| let stats = await tracker.getStats() | ||
|
|
||
| print(" ✓ Completed: \(stats.completed)/\(layerCount)") | ||
| print(" ✓ Max concurrent: \(stats.max)") | ||
| print(" ✓ Duration: \(String(format: "%.3f", duration))s") | ||
|
|
||
| guard stats.max <= maxConcurrent + 1 else { | ||
| throw TestError.concurrencyLimitExceeded | ||
| } | ||
|
|
||
| guard stats.completed == layerCount else { | ||
| throw TestError.incompleteTasks | ||
| } | ||
|
|
||
| print(" ✅ PASSED\n") | ||
| } | ||
|
|
||
| print("All tests passed!") | ||
| } | ||
|
|
||
| enum TestError: Error { | ||
| case concurrencyLimitExceeded | ||
| case incompleteTasks | ||
| } | ||
|
|
||
| Task { | ||
| do { | ||
| try await testConcurrentDownloads() | ||
| exit(0) | ||
| } catch { | ||
| print("Test failed: \(error)") | ||
| exit(1) | ||
| } | ||
| } | ||
|
|
||
| RunLoop.main.run() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| #!/usr/bin/env swift | ||
|
|
||
| import Foundation | ||
|
|
||
| print("Testing parameter flow...\n") | ||
|
|
||
| print("1. CLI flag parsing...") | ||
| struct ProgressFlags { | ||
| var disableProgressUpdates = false | ||
| var maxConcurrentDownloads: Int = 3 | ||
| } | ||
|
|
||
| let defaultFlags = ProgressFlags() | ||
| print(" ✓ Default: \(defaultFlags.maxConcurrentDownloads)") | ||
|
|
||
| let customFlags = ProgressFlags(disableProgressUpdates: false, maxConcurrentDownloads: 6) | ||
| print(" ✓ Custom: \(customFlags.maxConcurrentDownloads)") | ||
| print(" PASSED\n") | ||
|
|
||
| print("2. XPC key...") | ||
| enum ImageServiceXPCKeys: String { | ||
| case maxConcurrentDownloads | ||
| } | ||
|
|
||
| let key = ImageServiceXPCKeys.maxConcurrentDownloads | ||
| print(" ✓ Key exists: \(key.rawValue)") | ||
| print(" PASSED\n") | ||
|
|
||
| print("3. Function signatures...") | ||
| func mockClientImagePull( | ||
| reference: String, | ||
| maxConcurrentDownloads: Int = 3 | ||
| ) -> String { | ||
| return "pull(\(reference), maxConcurrent=\(maxConcurrentDownloads))" | ||
| } | ||
|
|
||
| _ = mockClientImagePull(reference: "nginx:latest") | ||
| _ = mockClientImagePull(reference: "nginx:latest", maxConcurrentDownloads: 6) | ||
| print(" ✓ Compiles") | ||
| print(" PASSED\n") | ||
|
|
||
| print("4. Parameter propagation...") | ||
|
|
||
| struct MockXPCMessage { | ||
| var values: [String: Any] = [:] | ||
|
|
||
| mutating func set(key: String, value: Int64) { | ||
| values[key] = value | ||
| } | ||
|
|
||
| func int64(key: String) -> Int64 { | ||
| return values[key] as? Int64 ?? 3 | ||
| } | ||
| } | ||
|
|
||
| func simulateFlow(maxConcurrent: Int) -> Int { | ||
| let flags = ProgressFlags(maxConcurrentDownloads: maxConcurrent) | ||
| var xpcMessage = MockXPCMessage() | ||
| xpcMessage.set(key: "maxConcurrentDownloads", value: Int64(flags.maxConcurrentDownloads)) | ||
| return Int(xpcMessage.int64(key: "maxConcurrentDownloads")) | ||
| } | ||
|
|
||
| for testValue in [1, 3, 6] { | ||
| guard simulateFlow(maxConcurrent: testValue) == testValue else { | ||
| print(" ✗ Failed") | ||
| exit(1) | ||
| } | ||
| } | ||
| print(" ✓ Values propagate correctly") | ||
| print(" PASSED\n") | ||
|
|
||
| print("5. Implementation verification...") | ||
|
|
||
| let filesToCheck = [ | ||
| "Sources/ContainerClient/Flags.swift", | ||
| "Sources/ContainerClient/Core/ClientImage.swift", | ||
| "Sources/Services/ContainerImagesService/Server/ImageService.swift", | ||
| ] | ||
|
|
||
| for file in filesToCheck { | ||
| if let content = try? String(contentsOf: URL(fileURLWithPath: file), encoding: .utf8), | ||
| content.contains("maxConcurrentDownloads") { | ||
| continue | ||
| } | ||
| print(" ✗ Missing in \(file)") | ||
| exit(1) | ||
| } | ||
| print(" ✓ Found in implementation") | ||
| print(" PASSED\n") | ||
|
|
||
| print("All tests passed!") |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Originally, we had to upgrade to 0.11.0. At this moment, we don't have to downgrade to it. Please revert this change.