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

Fix checkSanity. We do not need to check the priority anymore. 

- It's taken care by VRRP.

wip: clean up where priority is still used.
This commit is contained in:
wilderrodrigues 2015-02-06 14:12:40 +01:00
parent 57d3ffaef8
commit 3af2ce3f50
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1077,10 +1077,19 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
continue;
}
checkedNetwork.add(routerGuestNtwkId);
final List<DomainRouterVO> checkingRouters = _routerDao.listByNetworkAndRole(routerGuestNtwkId, Role.VIRTUAL_ROUTER);
final List<DomainRouterVO> checkingRouters;
Long vpcId = router.getVpcId();
if (vpcId != null) {
checkingRouters = _routerDao.listByVpcId(vpcId);
} else {
checkingRouters = _routerDao.listByNetworkAndRole(routerGuestNtwkId, Role.VIRTUAL_ROUTER);
}
if (checkingRouters.size() != 2) {
continue;
}
DomainRouterVO masterRouter = null;
DomainRouterVO backupRouter = null;
for (final DomainRouterVO r : checkingRouters) {
@ -1088,23 +1097,22 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
if (masterRouter == null) {
masterRouter = r;
} else {
// Duplicate master! We give up, until the admin
// fix duplicate MASTER issue
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Force a restart in order to fix the conflict
recoverRedundantNetwork(masterRouter, r);
break;
}
} else if (r.getRedundantState() == RedundantState.BACKUP) {
if (backupRouter == null) {
backupRouter = r;
} else {
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Do we have 2 routers in Backup state? Perhaps a restart of 1 router is needed.
recoverRedundantNetwork(backupRouter, r);
break;
}
}
}
if (masterRouter != null && backupRouter != null) {
if (_nwHelper.getRealPriority(masterRouter) - DEFAULT_DELTA + 1 != _nwHelper.getRealPriority(backupRouter) || backupRouter.getIsPriorityBumpUp()) {
recoverRedundantNetwork(masterRouter, backupRouter);
}
}
}
}
}