Skip to content

Shutdown VM gracefully from created state #495

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
dcantah merged 2 commits into from
Jan 26, 2026
Merged

Shutdown VM gracefully from created state #495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ea2665
Shutdown VM gracefully from created state
JaewonHur Jan 26, 2026
6cc45df
Cleanup fileMountContext
JaewonHur Jan 26, 2026
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
61 changes: 39 additions & 22 deletions Sources/Containerization/LinuxContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,12 +606,25 @@ extension LinuxContainer {
return
}

let startedState = try state.startedState("stop")
let vm = startedState.vm
let vm: any VirtualMachineInstance
let relayManager: UnixSocketRelayManager
let fileMountContext: FileMountContext

let startedState = try? state.startedState("stop")
if let startedState {
vm = startedState.vm
relayManager = startedState.relayManager
fileMountContext = startedState.fileMountContext
} else {
let createdState = try state.createdState("stop")
vm = createdState.vm
relayManager = createdState.relayManager
fileMountContext = createdState.fileMountContext
}

var firstError: Error?
do {
try await startedState.relayManager.stopAll()
try await relayManager.stopAll()
} catch {
self.logger?.error("failed to stop relay manager: \(error)")
firstError = firstError ?? error
Expand All @@ -634,15 +647,17 @@ extension LinuxContainer {
}
}

// Now lets ensure every process is donezo.
try await agent.kill(pid: -1, signal: SIGKILL)
if let _ = startedState {
// Now lets ensure every process is donezo.
try await agent.kill(pid: -1, signal: SIGKILL)

// Wait on init proc exit. Give it 5 seconds of leeway.
_ = try await agent.waitProcess(
id: self.id,
containerID: self.id,
timeoutInSeconds: 5
)
// Wait on init proc exit. Give it 5 seconds of leeway.
_ = try await agent.waitProcess(
id: self.id,
containerID: self.id,
timeoutInSeconds: 5
)
}

// Today, we leave EBUSY looping and other fun logic up to the
// guest agent.
Expand All @@ -658,24 +673,26 @@ extension LinuxContainer {
firstError = firstError ?? error
}

for process in startedState.vendedProcesses.values {
if let startedState {
for process in startedState.vendedProcesses.values {
do {
try await process._delete()
} catch {
self.logger?.error("failed to delete process \(process.id): \(error)")
firstError = firstError ?? error
}
}

do {
try await process._delete()
try await startedState.process.delete()
} catch {
self.logger?.error("failed to delete process \(process.id): \(error)")
self.logger?.error("failed to delete init process: \(error)")
firstError = firstError ?? error
}
}

do {
try await startedState.process.delete()
} catch {
self.logger?.error("failed to delete init process: \(error)")
firstError = firstError ?? error
}

// Clean up file mount temporary directories.
startedState.fileMountContext.cleanup()
fileMountContext.cleanup()

do {
try await vm.stop()
Expand Down
Loading