Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2532511285 for ; Fri, 25 Apr 2014 09:16:49 +0000 (UTC) Received: (qmail 76305 invoked by uid 500); 25 Apr 2014 09:16:47 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 76154 invoked by uid 500); 25 Apr 2014 09:16:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 76123 invoked by uid 99); 25 Apr 2014 09:16:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2014 09:16:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9BF49951161; Fri, 25 Apr 2014 09:16:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Fri, 25 Apr 2014 09:16:46 -0000 Message-Id: <8951a181fc434e9fa9257e71d1e3b31c@git.apache.org> In-Reply-To: <4b9d861ee6e54e838da3b5167a6ee00e@git.apache.org> References: <4b9d861ee6e54e838da3b5167a6ee00e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.4-forward to 380998a 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 Authored: Fri Apr 25 14:36:31 2014 +0530 Committer: Murali Reddy 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) {