Skip to content

Add explicit destructive operation logging for Kill/Remove #129

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
praveenkumar merged 1 commit into from
Jun 9, 2026
Merged

Add explicit destructive operation logging for Kill/Remove #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 44 additions & 4 deletions pkg/libvirt/libvirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@ type Driver struct {
vmLoaded bool
}

func operationLogFields(operation string, machineName string, err error) log.Fields {
switch err {
case nil:
return log.Fields{
"operation": operation,
"machine": machineName,
}
default:
return log.Fields{
"operation": operation,
"machine": machineName,
"error": err.Error(),
}
}
}

func operationLog(operation string, machineName string, err error) *log.Entry {
return log.WithFields(operationLogFields(operation, machineName, err))
}

func (d *Driver) GetMachineName() string {
return d.MachineName
}
Expand Down Expand Up @@ -440,15 +460,28 @@ func (d *Driver) Stop() error {

func (d *Driver) Remove() error {
log.Debugf("Removing VM %s", d.MachineName)
_ = d.validateVMRef()
err := d.validateVMRef()
if err != nil {
operationLog("Remove", d.MachineName, err).Error("destructive operation failed")

@praveenkumar praveenkumar Jun 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏼

}
if !d.vmLoaded {
operationLog("Remove", d.MachineName, nil).Info("destructive operation succeeded")
return nil
}
// Note: If we switch to qcow disks instead of raw the user
// could take a snapshot. If you do, then Undefine
// will fail unless we nuke the snapshots first
_ = d.vm.Destroy() // Ignore errors
return d.vm.UndefineFlags(libvirt.DOMAIN_UNDEFINE_NVRAM)
err = d.vm.Destroy() // Ignore errors
if err != nil {
operationLog("Remove", d.MachineName, err).Error("destructive operation failed")
}
err = d.vm.UndefineFlags(libvirt.DOMAIN_UNDEFINE_NVRAM)
if err != nil {
operationLog("Remove", d.MachineName, err).Error("destructive operation failed")
return err
}
operationLog("Remove", d.MachineName, nil).Info("destructive operation succeeded")
return nil
}

func (d *Driver) Restart() error {
Expand All @@ -462,9 +495,16 @@ func (d *Driver) Restart() error {
func (d *Driver) Kill() error {
log.Debugf("Killing VM %s", d.MachineName)
if err := d.validateVMRef(); err != nil {
operationLog("Kill", d.MachineName, err).Error("destructive operation failed")
return err
}
return d.vm.Destroy()
err := d.vm.Destroy()
if err != nil {
operationLog("Kill", d.MachineName, err).Error("destructive operation failed")
return err
}
operationLog("Kill", d.MachineName, nil).Info("destructive operation succeeded")
return nil
}

func (d *Driver) GetState() (state.State, error) {
Expand Down
Loading