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 D41AF10677 for ; Tue, 17 Mar 2015 10:26:08 +0000 (UTC) Received: (qmail 91423 invoked by uid 500); 17 Mar 2015 10:26:04 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91372 invoked by uid 500); 17 Mar 2015 10:26:04 -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 89711 invoked by uid 99); 17 Mar 2015 10:26:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2015 10:26:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 844E2E1874; Tue, 17 Mar 2015 10:26:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Tue, 17 Mar 2015 10:26:33 -0000 Message-Id: In-Reply-To: <0905c11225aa4ceab16836e7eb0bed4c@git.apache.org> References: <0905c11225aa4ceab16836e7eb0bed4c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] git commit: updated refs/heads/master to 3c429ee Fix state of isolated redundant network router - once stopped, got to UNKNOWN Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae6b07af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae6b07af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae6b07af Branch: refs/heads/master Commit: ae6b07af15665ca35f8a9ea732c7f5b58b80f8ef Parents: b3da2c5 Author: wilderrodrigues Authored: Sat Feb 7 10:15:24 2015 +0100 Committer: wilderrodrigues Committed: Mon Mar 16 11:40:04 2015 +0100 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae6b07af/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 5d59813..234c745 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1173,6 +1173,7 @@ Configurable, StateListener { } else { router = router1; } + // && router.getState() == State.Stopped if (router.getHostId() == null) { s_logger.debug("Skip router pair (" + router0.getInstanceName() + "," + router1.getInstanceName() + ") due to can't find host"); continue;