cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [48/50] [abbrv] git commit: updated refs/heads/feature/systemvm-persistent-config to 8620642
Date Mon, 16 Feb 2015 16:48:29 GMT
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/05f7caa4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05f7caa4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05f7caa4

Branch: refs/heads/feature/systemvm-persistent-config
Commit: 05f7caa4b62833af28f0fd8570abf072746dc404
Parents: 0cc3906
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Wed Feb 11 20:12:49 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Mon Feb 16 16:08:47 2015 +0100

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05f7caa4/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 (wrodrigues@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;


Mime
View raw message