|
|
43fe83 |
From 20832604f4fb7568148bcf277452a2981ff2456d Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <20832604f4fb7568148bcf277452a2981ff2456d.1381871411.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
43fe83 |
Date: Mon, 7 Oct 2013 17:17:27 +0100
|
|
|
43fe83 |
Subject: [PATCH] Don't set netdev offline in container cleanup
|
|
|
43fe83 |
|
|
|
43fe83 |
For
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1014604
|
|
|
43fe83 |
|
|
|
43fe83 |
During container cleanup there is a race where the kernel may
|
|
|
43fe83 |
have destroyed the veth device before we try to set it offline.
|
|
|
43fe83 |
This causes log error messages. Given that we're about to
|
|
|
43fe83 |
delete the device entirely, setting it offline is pointless.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit f5eae5708623401f50a07729283624423894ed68)
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/lxc/lxc_process.c | 1 -
|
|
|
43fe83 |
1 file changed, 1 deletion(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
|
|
|
43fe83 |
index 0a28305..bc9bdfb 100644
|
|
|
43fe83 |
--- a/src/lxc/lxc_process.c
|
|
|
43fe83 |
+++ b/src/lxc/lxc_process.c
|
|
|
43fe83 |
@@ -192,7 +192,6 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
|
|
|
43fe83 |
virDomainNetDefPtr iface = vm->def->nets[i];
|
|
|
43fe83 |
vport = virDomainNetGetActualVirtPortProfile(iface);
|
|
|
43fe83 |
if (iface->ifname) {
|
|
|
43fe83 |
- ignore_value(virNetDevSetOnline(iface->ifname, false));
|
|
|
43fe83 |
if (vport &&
|
|
|
43fe83 |
vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
|
|
|
43fe83 |
ignore_value(virNetDevOpenvswitchRemovePort(
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|