etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
wilderrodrigues 2015-02-11 20:12:49 +01:00
parent e7969b640b
commit 20d9715816
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -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;