cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4-forward to 380998a
Date Fri, 25 Apr 2014 09:16:46 GMT
CLOUDSTACK-6505: XenServer bridge for the OVS tunnel network gets reset
on the hosts in the xenserver cluster

this fix ensures that brige is created only once so that openflow rules
configured on the bridge are not lost.


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

Branch: refs/heads/4.4-forward
Commit: 771d1346d1bd9b64a5eba17bc37134fba5a3112d
Parents: 66f8e0e
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Fri Apr 25 14:36:31 2014 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Fri Apr 25 14:46:25 2014 +0530

----------------------------------------------------------------------
 .../hypervisor/xen/resource/CitrixResourceBase.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/771d1346/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 3fc7974..d01076a 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -936,14 +936,13 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
             synchronized (_tmpDom0Vif) {
                 _tmpDom0Vif.add(dom0vif);
             }
+            try {
+                dom0vif.plug(conn);
+            } catch (Exception e) {
+                // though an exception is thrown here, VIF actually gets plugged-in to dom0,
so just ignore the exception
+            }
+            dom0vif.unplug(conn);
         }
-        // At this stage we surely have a VIF
-        try {
-            dom0vif.plug(conn);
-        } catch (Exception e) {
-            // though an exception is thrown here, VIF actually gets plugged-in to dom0,
so just ignore the exception
-        }
-        dom0vif.unplug(conn);
     }
 
     private synchronized Network setupvSwitchNetwork(Connection conn) {


Mime
View raw message