One of the routers is not running, so we don't have to continue here since the host will be null any way. Also, there is no need To check either for sanity of duplicate master. Thus, just update the state and get lost.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20d97158 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20d97158 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20d97158 Branch: refs/heads/master Commit: 20d97158169fda8469cf166b7eadf2a2f8ef3680 Parents: e7969b6 Author: wilderrodrigues <wrodrig...@schubergphilis.com> Authored: Wed Feb 11 20:12:49 2015 +0100 Committer: wilderrodrigues <wrodrig...@schubergphilis.com> Committed: Mon Mar 16 11:40:07 2015 +0100 ---------------------------------------------------------------------- .../network/router/VirtualNetworkApplianceManagerImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20d97158/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 5a97eb3..42537c1 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1174,6 +1174,15 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> { */ final DomainRouterVO router0 = routers.get(0); final DomainRouterVO router1 = routers.get(1); + + if (router0.getState() != State.Running || router1.getState() != State.Running) { + updateRoutersRedundantState(routers); + // Wilder Rodrigues (wrodrig...@schubergphilis.com) - One of the routers is not running, + // so we don't have to continue here since the host will be null any way. Also, there is no need + // To check either for sanity of duplicate master. Thus, just update the state and get lost. + continue; + } + DomainRouterVO router = router0; if (router0.getId() < router1.getId()) { router = router0;
