github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-05 10:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3824 from fidencio/stable-2.3-clh-stop-virtiofsd-if-clh-fails-to-boot-up-the-vm

Browse Source 
stable-2.3 | clh: stop virtofsd if clh fails to boot up the vm
This commit is contained in:
Fabiano Fidêncio
2022-03-03 23:25:45 +01:00
committed by GitHub
parent 97cd593953 b2a7eea4a7
commit a2c228ef66
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/virtcontainers/clh.go
View File

@@ -405,15 +405,20 @@ func (clh *cloudHypervisor) StartVM(ctx context.Context, timeout int) error {
return err return err
} }
clh.state.VirtiofsdPID = pid clh.state.VirtiofsdPID = pid
defer func() {
if err != nil {
if shutdownErr := clh.virtiofsd.Stop(ctx); shutdownErr != nil {
clh.Logger().WithError(shutdownErr).Warn("error shutting down VirtiofsDaemon")
}
}
}()
} else { } else {
return errors.New("cloud-hypervisor only supports virtio based file sharing") return errors.New("cloud-hypervisor only supports virtio based file sharing")
} }
pid, err := clh.launchClh() pid, err := clh.launchClh()
if err != nil { if err != nil {
if shutdownErr := clh.virtiofsd.Stop(ctx); shutdownErr != nil {
clh.Logger().WithError(shutdownErr).Warn("error shutting down Virtiofsd")
}
return fmt.Errorf("failed to launch cloud-hypervisor: %q", err) return fmt.Errorf("failed to launch cloud-hypervisor: %q", err)
} }
clh.state.PID = pid clh.state.PID = pid