cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 57ba367
Date Fri, 08 Nov 2013 08:01:12 GMT
Updated Branches:
  refs/heads/master 63b23bb34 -> 57ba367f3


check Linux bridge status before remove it (Cherry-picked from commit a33f0e7bdd3bc359e483eca36cf9faf1f2c7c521)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fc6e69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fc6e69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fc6e69

Branch: refs/heads/master
Commit: c2fc6e69b5eabcd706879f1b0df30ff19669c584
Parents: 63b23bb
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Thu Nov 7 11:06:42 2013 +0100
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Fri Nov 8 09:00:12 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/c2fc6e69/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 84743ec..b400fd2 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
@@ -205,7 +205,11 @@ public class BridgeVifDriver extends VifDriverBase {
 
     private void deleteVnetBr(String brName) {
         synchronized (_vnetBridgeMonitor) {
-            String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif
| tr '\n' ' '");
+            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 |
tr '\n' ' '");
             if (cmdout != null && cmdout.contains("vnet")) {
                 // Active VM remains on that bridge
                 return;


Mime
View raw message