Skip to content

fix(copy): keep lifecycle usable after missing source#799

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

Closed
stephenlclarke wants to merge 1 commit into from
Closed

fix(copy): keep lifecycle usable after missing source #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 44 additions & 12 deletions Sources/Containerization/LinuxContainer.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
private let value = Mutex<(any Error)?>(nil)

func store(_ error: any Error) {
value.withLock { $0 = error }
}

func load() -> (any Error)? {
value.withLock { $0 }
}
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
let listener = try state.vm.listen(port)

let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
let producerError = CopyOutProducerError()
defer {
metadataCont.finish()
try? listener.finish()
}

try await withThrowingTaskGroup(of: Void.self) { group in
group.addTask {
try await state.vm.withAgent { agent in
guard let vminitd = agent as? Vminitd else {
throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
}
try await vminitd.copy(
direction: .copyOut,
guestPath: guestPath,
vsockPort: port,
onMetadata: { meta in
metadataCont.yield(meta)
metadataCont.finish()
do {
try await state.vm.withAgent { agent in
guard let vminitd = agent as? Vminitd else {
throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
}
)
try await vminitd.copy(
direction: .copyOut,
guestPath: guestPath,
vsockPort: port,
onMetadata: { meta in
metadataCont.yield(meta)
metadataCont.finish()
}
)
}
} catch {
// Guest validation can fail before either stream yields.
// Finish both so the sibling task can release the state lock.
producerError.store(error)
metadataCont.finish()
try? listener.finish()
throw error
}
}

group.addTask {
guard let metadata = await metadataStream.first(where: { _ in true }) else {
if let error = producerError.load() {
throw error
}
throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
}

guard let conn = await listener.first(where: { _ in true }) else {
if let error = producerError.load() {
throw error
}
throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
}
try listener.finish()
Expand Down
56 changes: 56 additions & 0 deletions Sources/Integration/ContainerTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
}
}

func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
let id = "test-copy-out-missing-source"

let bs = try await bootstrap(id)
let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
.appendingPathComponent("missing-output.txt")

let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
config.process.arguments = ["sleep", "100"]
config.bootLog = bs.bootLog
}

do {
try await container.create()
try await container.start()

do {
try await Timeout.run(seconds: 5) {
try await container.copyOut(
from: URL(filePath: "/does-not-exist"),
to: hostDestination
)
}
throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
} catch is CancellationError {
throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
} catch let error as IntegrationError {
throw error
} catch {
let message = String(describing: error)
guard !message.contains("copyOut: no metadata received"),
!message.contains("copyOut: vsock connection not established")
else {
throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
}
}

let exec = try await container.exec("after-missing-copy") { config in
config.arguments = ["true"]
}
try await exec.start()
let status = try await exec.wait()
try await exec.delete()
guard status.exitCode == 0 else {
throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
}

try await container.kill(.kill)
try await container.wait()
try await container.stop()
} catch {
try? await container.stop()
throw error
}
}

func testCopyLargeFile() async throws {
let id = "test-copy-large-file"

Expand Down
1 change: 1 addition & 0 deletions Sources/Integration/Suite.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
Test("container copy out", testCopyOut),
Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
Test("container copy large file", testCopyLargeFile),
Test("container copy in directory", testCopyInDirectory),
Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
fix(copy): keep lifecycle usable after missing source by stephenlclarke · Pull Request #799 · apple/containerization · GitHub
Skip to content
fix(copy): keep lifecycle usable after missing source#799

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

 Closed

stephenlclarke
wants to merge
1
commit into

from

 Closed


fix(copy): keep lifecycle usable after missing source
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


56 changes: 44 additions & 12 deletions
Sources/Containerization/LinuxContainer.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,18 @@ import SystemPackage

import struct ContainerizationOS.Terminal

private final class CopyOutProducerError: Sendable {
 private let value = Mutex<(any Error)?>(nil)

 func store(_ error: any Error) {
 value.withLock { $0 = error }
 }

 func load() -> (any Error)? {
 value.withLock { $0 }
 }
}

/// `LinuxContainer` is an easy to use type for launching and managing the
/// full lifecycle of a Linux container ran inside of a virtual machine.
public final class LinuxContainer: Container, Sendable {
Expand DownExpand Up@@ -1353,31 +1365,51 @@ extension LinuxContainer {
 let listener = try state.vm.listen(port)

 let (metadataStream, metadataCont) = AsyncStream.makeStream(of: Vminitd.CopyMetadata.self)
 let producerError = CopyOutProducerError()
 defer {
 metadataCont.finish()
 try? listener.finish()
 }

 try await withThrowingTaskGroup(of: Void.self) { group in
 group.addTask {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 do {
 try await state.vm.withAgent { agent in
 guard let vminitd = agent as? Vminitd else {
 throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")
 }
 )
 try await vminitd.copy(
 direction: .copyOut,
 guestPath: guestPath,
 vsockPort: port,
 onMetadata: { meta in
 metadataCont.yield(meta)
 metadataCont.finish()
 }
 )
 }
 } catch {
 // Guest validation can fail before either stream yields.
 // Finish both so the sibling task can release the state lock.
 producerError.store(error)
 metadataCont.finish()
 try? listener.finish()
 throw error
 }
 }

 group.addTask {
 guard let metadata = await metadataStream.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: no metadata received")
 }

 guard let conn = await listener.first(where: { _ in true }) else {
 if let error = producerError.load() {
 throw error
 }
 throw ContainerizationError(.internalError, message: "copyOut: vsock connection not established")
 }
 try listener.finish()
Expand Down

56 changes: 56 additions & 0 deletions
Sources/Integration/ContainerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2114,6 +2114,62 @@ extension IntegrationSuite {
 }
 }

 func testCopyOutMissingSourceDoesNotBlockLifecycle() async throws {
 let id = "test-copy-out-missing-source"

 let bs = try await bootstrap(id)
 let hostDestination = FileManager.default.uniqueTemporaryDirectory(create: true)
 .appendingPathComponent("missing-output.txt")

 let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
 config.process.arguments = ["sleep", "100"]
 config.bootLog = bs.bootLog
 }

 do {
 try await container.create()
 try await container.start()

 do {
 try await Timeout.run(seconds: 5) {
 try await container.copyOut(
 from: URL(filePath: "/does-not-exist"),
 to: hostDestination
 )
 }
 throw IntegrationError.assert(msg: "copyOut should fail for a missing source")
 } catch is CancellationError {
 throw IntegrationError.assert(msg: "copyOut did not fail before the timeout")
 } catch let error as IntegrationError {
 throw error
 } catch {
 let message = String(describing: error)
 guard !message.contains("copyOut: no metadata received"),
 !message.contains("copyOut: vsock connection not established")
 else {
 throw IntegrationError.assert(msg: "copyOut replaced the guest error with '\(message)'")
 }
 }

 let exec = try await container.exec("after-missing-copy") { config in
 config.arguments = ["true"]
 }
 try await exec.start()
 let status = try await exec.wait()
 try await exec.delete()
 guard status.exitCode == 0 else {
 throw IntegrationError.assert(msg: "container lifecycle remained blocked after copyOut failure")
 }

 try await container.kill(.kill)
 try await container.wait()
 try await container.stop()
 } catch {
 try? await container.stop()
 throw error
 }
 }

 func testCopyLargeFile() async throws {
 let id = "test-copy-large-file"

Expand Down

1 change: 1 addition & 0 deletions
Sources/Integration/Suite.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,7 @@ struct IntegrationSuite: AsyncParsableCommand {
 Test("container copy in file to missing directory fails", testCopyInFileToMissingDirectoryFails),
 Test("container copy in directory over existing file fails", testCopyInDirectoryOverExistingFileFails),
 Test("container copy out", testCopyOut),
 Test("container copy out missing source does not block lifecycle", testCopyOutMissingSourceDoesNotBlockLifecycle),
 Test("container copy large file", testCopyLargeFile),
 Test("container copy in directory", testCopyInDirectory),
 Test("container copy out directory", testCopyOutDirectory),
Expand Down
Loading