Merge branch 'main' into live-flag-for-container-export

Author: JaewonHur

Makefile

@@ -221,7 +221,8 @@ INTEGRATION_TEST_SUITES ?= \
 	TestCLISystemDF \
 	TestCLIMachineCommand \
 	TestCLIMachineRuntime \
-	TestCLINoParallelCases
+	TestCLINoParallelCases \
+	TestCLICopyCommand
 
 empty :=
 space := $(empty) $(empty)

Sources/ContainerCommands/Container/ContainerCopy.swift

@@ -65,16 +65,17 @@ extension Application {
             switch (srcRef, dstRef) {
             case (.container(let id, let path), .local(let localPath)):
                 let srcPath = FilePath(path)
-                let destPath = FilePath((localPath as NSString).standardizingPath)
+                let destPath = FilePath(URL(fileURLWithPath: localPath, relativeTo: .currentDirectory()).absoluteURL.path(percentEncoded: false))
                 var isDirectory: ObjCBool = false
                 let exists = FileManager.default.fileExists(atPath: destPath.string, isDirectory: &isDirectory)
 
+                var finalDestPath = destPath
                 if exists && isDirectory.boolValue {
                     guard let lastComponent = srcPath.lastComponent else {
                         throw ContainerizationError(.invalidArgument, message: "source path has no last component: \(path)")
                     }
-                    let finalDest = destPath.appending(lastComponent)
-                    try await client.copyOut(id: id, source: path, destination: finalDest.string)
+                    finalDestPath = destPath.appending(lastComponent)
+                    try await client.copyOut(id: id, source: path, destination: finalDestPath.string)
                 } else if localPath.hasSuffix("/") {
                     try await client.copyOut(id: id, source: path, destination: destPath.string)
                     var resultIsDir: ObjCBool = false
@@ -89,9 +90,15 @@ extension Application {
                 } else {
                     try await client.copyOut(id: id, source: path, destination: destPath.string)
                 }
+                print(finalDestPath.string)
             case (.local(let localPath), .container(let id, let path)):
-                let srcPath = FilePath((localPath as NSString).standardizingPath)
+                let srcPath = FilePath(URL(fileURLWithPath: localPath, relativeTo: .currentDirectory()).absoluteURL.path(percentEncoded: false))
                 var isDirectory: ObjCBool = false
+
+                guard let lastComponent = srcPath.lastComponent else {
+                    throw ContainerizationError(.invalidArgument, message: "source path has no last component: \(localPath)")
+                }
+
                 guard FileManager.default.fileExists(atPath: srcPath.string, isDirectory: &isDirectory) else {
                     throw ContainerizationError(.notFound, message: "source path does not exist: \(localPath)")
                 }
@@ -100,6 +107,8 @@ extension Application {
                 }
 
                 try await client.copyIn(id: id, source: srcPath.string, destination: path, createParents: true)
+                let printedDest = path.hasSuffix("/") ? "\(id):\(path)\(lastComponent.string)" : "\(id):\(path)"
+                print(printedDest)
             case (.container, .container):
                 throw ContainerizationError(.invalidArgument, message: "copying between containers is not supported")
             case (.local, .local):

Sources/Services/ContainerAPIService/Client/ProcessIO.swift

@@ -105,7 +105,12 @@ public struct ProcessIO: Sendable {
                     cc.yield()
                     return
                 }
-                try! pout.write(contentsOf: data)
+                do {
+                    try pout.write(contentsOf: data)
+                } catch {
+                    rout.readabilityHandler = nil
+                    cc.yield()
+                }
             }
         }
 
@@ -126,7 +131,12 @@ public struct ProcessIO: Sendable {
                     cc.yield()
                     return
                 }
-                try! perr.write(contentsOf: data)
+                do {
+                    try perr.write(contentsOf: data)
+                } catch {
+                    rerr.readabilityHandler = nil
+                    cc.yield()
+                }
             }
             stdio[2] = stderr.fileHandleForWriting
         }

Sources/Services/Network/Server/DefaultNetworkService.swift

@@ -95,13 +95,13 @@ public actor DefaultNetworkService: NetworkService {
         }
         macAddresses[index] = macAddress
 
-        if allocationsBySession[session] == nil {
-            allocationsBySession[session] = []
+        let isNewSession = allocationsBySession[session] == nil
+        allocationsBySession[session, default: []].append((hostname: hostname, index: index))
+        if isNewSession {
             await session.onDisconnect { [weak self] in
                 await self?.releaseSession(session)
             }
         }
-        allocationsBySession[session]!.append((hostname: hostname, index: index))
 
         return (attachment: attachment, additionalData: additionalData)
     }

Sources/Services/RuntimeLinux/Server/RuntimeService.swift

@@ -1303,7 +1303,9 @@ public actor RuntimeService {
 
                 return code
             }
-        } catch {}
+        } catch {
+            self.log.error("graceful stop failed; forcing vm shutdown", metadata: ["error": "\(error)"])
+        }
 
         // Now actually bring down the vm.
         try await lc.stop()

Tests/CLITests/Subcommands/Containers/TestCLICopy.swift

@@ -905,4 +905,54 @@ class TestCLICopyCommand: CLITest {
             Issue.record("testCopyInDirectoryContentsToExistingDirectoryTrailingSlash failed: \(error)")
         }
     }
+
+    // MARK: - Relative path resolution
+
+    @Test func testCopyInRelativeSourcePath() throws {
+        do {
+            let name = getTestName()
+            try doCreate(name: name)
+            defer { try? doStop(name: name) }
+            try doStart(name: name)
+            try waitForContainerRunning(name)
+
+            let content = "relative source"
+            try content.write(to: testDir.appendingPathComponent("relfile.txt"), atomically: true, encoding: .utf8)
+
+            let (_, _, error, status) = try run(
+                arguments: ["copy", "./relfile.txt", "\(name):/tmp/"],
+                currentDirectory: testDir)
+            if status != 0 { throw CLIError.executionFailed("copy failed: \(error)") }
+
+            let result = try doExec(name: name, cmd: ["cat", "/tmp/relfile.txt"])
+            #expect(result.trimmingCharacters(in: .whitespacesAndNewlines) == content)
+            try doStop(name: name)
+        } catch {
+            Issue.record("testCopyInRelativeSourcePath failed: \(error)")
+        }
+    }
+
+    @Test func testCopyOutRelativeDestinationPath() throws {
+        do {
+            let name = getTestName()
+            try doCreate(name: name)
+            defer { try? doStop(name: name) }
+            try doStart(name: name)
+            try waitForContainerRunning(name)
+
+            let content = "relative dest"
+            _ = try doExec(name: name, cmd: ["sh", "-c", "echo -n '\(content)' > /tmp/relfile.txt"])
+
+            let (_, _, error, status) = try run(
+                arguments: ["copy", "\(name):/tmp/relfile.txt", "./"],
+                currentDirectory: testDir)
+            if status != 0 { throw CLIError.executionFailed("copy failed: \(error)") }
+
+            let result = try String(contentsOfFile: testDir.appendingPathComponent("relfile.txt").path, encoding: .utf8)
+            #expect(result == content)
+            try doStop(name: name)
+        } catch {
+            Issue.record("testCopyOutRelativeDestinationPath failed: \(error)")
+        }
+    }
 }

Tests/CLITests/Subcommands/Containers/TestCLIPrune.swift

@@ -23,7 +23,8 @@ class TestCLIPruneCommand: CLITest {
         Test.current!.name.trimmingCharacters(in: ["(", ")"]).lowercased()
     }
 
-    @Test func testContainerPruneNoContainers() throws {
+    @Test(.disabled("flaky — prune picks up containers from concurrent suites; tests being rewritten"))
+    func testContainerPruneNoContainers() throws {
         let (_, _, error, status) = try run(arguments: ["prune"])
         if status != 0 {
             throw CLIError.executionFailed("container prune failed: \(error)")