Merge branch 'main' into changes/rosetta-aot-cache

Author: culpen90

Sources/Containerization/Image/ImageStore/ImageStore+ReferenceManager.swift

@@ -49,7 +49,7 @@ extension ImageStore {
 
         private func save(_ state: State) throws {
             let statePath = self.path.appendingPathComponent("state.json")
-            try JSONEncoder().encode(state).write(to: statePath)
+            try JSONEncoder().encode(state).write(to: statePath, options: .atomic)
         }
 
         public func delete(reference: String) throws {

Sources/Containerization/LinuxContainer.swift

@@ -641,8 +641,8 @@ extension LinuxContainer {
             let vm = try await self.vmm.create(config: creationConfig)
             let relayManager = UnixSocketRelayManager(vm: vm, log: self.logger)
 
-            try await vm.start()
             do {
+                try await vm.start()
                 let mountsForAgent = containerMounts
                 try await vm.withAgent { agent in
                     try await agent.standardSetup()
@@ -1356,6 +1356,7 @@ extension LinuxContainer {
 
             try await withThrowingTaskGroup(of: Void.self) { group in
                 group.addTask {
+                    defer { metadataCont.finish() }
                     try await state.vm.withAgent { agent in
                         guard let vminitd = agent as? Vminitd else {
                             throw ContainerizationError(.unsupported, message: "copyOut requires Vminitd agent")

Sources/Containerization/LinuxProcess.swift

@@ -125,14 +125,8 @@ public final class LinuxProcess: Sendable {
 
 extension LinuxProcess {
     func setupIO(listeners: [VsockListener?]) async throws -> [FileHandle?] {
-        // Nested virtualization (x86_64 CI) is dramatically slower to bring the
-        // guest vsock listeners up than native arm64 virt, so allow a longer
-        // window there while keeping the arm64 path tight.
-        #if arch(x86_64)
         let ioTimeout: UInt32 = 30
-        #else
-        let ioTimeout: UInt32 = 3
-        #endif
+
         let handles = try await Timeout.run(seconds: ioTimeout) {
             try await withThrowingTaskGroup(of: (Int, FileHandle?).self) { group in
                 var results = [FileHandle?](repeating: nil, count: 3)