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 4215817902 for ; Wed, 11 Feb 2015 17:03:27 +0000 (UTC) Received: (qmail 61981 invoked by uid 500); 11 Feb 2015 17:03:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 61941 invoked by uid 500); 11 Feb 2015 17:03:27 -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 61931 invoked by uid 99); 11 Feb 2015 17:03:27 -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; Wed, 11 Feb 2015 17:03:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE1E4E05D3; Wed, 11 Feb 2015 17:03:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Wed, 11 Feb 2015 17:03:26 -0000 Message-Id: <657e883b39c84d8a95c4d05e4aa48924@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: updated refs/heads/feature/systemvm-persistent-config to 4a012dd Repository: cloudstack Updated Branches: refs/heads/feature/systemvm-persistent-config b28e317dd -> 4a012dd30 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/a12193a5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a12193a5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a12193a5 Branch: refs/heads/feature/systemvm-persistent-config Commit: a12193a5fcd2ec879b6e1f3b4b69aea3391fca60 Parents: b28e317 Author: wilderrodrigues Authored: Sat Feb 7 10:15:24 2015 +0100 Committer: wilderrodrigues Committed: Sat Feb 7 10:15:24 2015 +0100 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a12193a5/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;