Merge pull request #1379 from stgraber/lifecycle

incusd/instance/qemu: Don't take over operations on console retrieval
lxc · Nov 15, 2024 · 8aa5456 · 8aa5456
2 parents 05cd817 + d7f9ebf
commit 8aa5456
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
@@ -9329,7 +9329,10 @@ func (d *qemu) ConsoleLog() (string, error) {
 		return "", err
 	}
 
-	defer op.Done(nil)
+	// Only mark the operation as done if only processing the console retrieval.
+	if op.Action() == operationlock.ActionConsoleRetrieve {
+		defer op.Done(nil)
+	}
 
 	// Check if the agent is running.
 	monitor, err := qmp.Connect(d.monitorPath(), qemuSerialChardevName, d.getMonitorEventHandler(), d.QMPLogFilePath())