Updated Branches: refs/heads/4.2 ed3d82eab -> de448ec47
check Linux bridge status before remove it Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a33f0e7b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a33f0e7b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a33f0e7b Branch: refs/heads/4.2 Commit: a33f0e7bdd3bc359e483eca36cf9faf1f2c7c521 Parents: ed3d82e Author: Wei Zhou <[email protected]> Authored: Thu Nov 7 11:06:42 2013 +0100 Committer: Wei Zhou <[email protected]> Committed: Thu Nov 7 11:06:42 2013 +0100 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a33f0e7b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 5c4c855..54e8646 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -176,7 +176,11 @@ public class BridgeVifDriver extends VifDriverBase { private void deleteVnetBr(String brName){ synchronized (_vnetBridgeMonitor) { - String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | grep vnet"); + String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName); + if (cmdout == null) + // Bridge does not exist + return; + cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | grep vnet"); if (cmdout != null && cmdout.contains("vnet")) { // Active VM remains on that bridge return;
