cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/feature/systemvm-persistent-config to 921f6e2
Date Mon, 16 Feb 2015 11:21:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/feature/systemvm-persistent-config 4a012dd30 -> 921f6e2a3


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/921f6e2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/921f6e2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/921f6e2a

Branch: refs/heads/feature/systemvm-persistent-config
Commit: 921f6e2a3f5b4d533f3427b9c2cbaf4c26142109
Parents: 4a012dd
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Wed Feb 11 20:12:49 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Wed Feb 11 20:12:49 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/921f6e2a/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