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

runtime: Fix logging on virtiofs shutdown

Browse Source 
Fixes a confusing log message shown when Virtio-FS is disabled.
Previously we logged “The virtiofsd had stopped” regardless of whether Virtio-FS was actually enabled or not.

Signed-off-by: Paweł Bęza <pawel.beza99@gmail.com>
This commit is contained in:
Paweł Bęza
2025-06-03 13:18:26 +02:00
parent dc0da567cd
commit 91db41227f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -726,7 +726,11 @@ func (clh *cloudHypervisor) StartVM(ctx context.Context, timeout int) error {
return err return err
} }
defer func() { defer func() {
if err != nil { if err == nil {
return
}
if clh.config.SharedFS == config.VirtioFS || clh.config.SharedFS == config.VirtioFSNydus {
if shutdownErr := clh.stopVirtiofsDaemon(ctx); shutdownErr != nil { if shutdownErr := clh.stopVirtiofsDaemon(ctx); shutdownErr != nil {
clh.Logger().WithError(shutdownErr).Warn("error shutting down VirtiofsDaemon") clh.Logger().WithError(shutdownErr).Warn("error shutting down VirtiofsDaemon")
} }
@@ -1303,11 +1307,13 @@ func (clh *cloudHypervisor) terminate(ctx context.Context, waitOnly bool) (err e
return err return err
} }
if clh.config.SharedFS == config.VirtioFS || clh.config.SharedFS == config.VirtioFSNydus {
clh.Logger().Debug("stop virtiofsDaemon") clh.Logger().Debug("stop virtiofsDaemon")
if err = clh.stopVirtiofsDaemon(ctx); err != nil { if err = clh.stopVirtiofsDaemon(ctx); err != nil {
clh.Logger().WithError(err).Error("failed to stop virtiofsDaemon") clh.Logger().WithError(err).Error("failed to stop virtiofsDaemon")
} }
}
return return
} }