The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7756

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
From 4dc02e4a02ba8311a49a97d67bff17a957879a39 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Fri, 7 Aug 2020 18:02:39 +0100
Subject: [PATCH] lxd/instance/drivers/driver/qemu: Fix race in onStop getting
 operation

Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
 lxd/instance/drivers/driver_qemu.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lxd/instance/drivers/driver_qemu.go 
b/lxd/instance/drivers/driver_qemu.go
index 5e671ceb52..cc12ed6d14 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -503,7 +503,9 @@ func (vm *qemu) onStop(target string) error {
        // Record power state.
        err := vm.state.Cluster.UpdateInstancePowerState(vm.id, "STOPPED")
        if err != nil {
-               op.Done(err)
+               if op != nil {
+                       op.Done(err)
+               }
                return err
        }
 
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to