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

Merge pull request #1222 from ekholabs/fix/rvr-ha-CLOUDSTACK-4374 

CLOUDSTACK-4374 - As a Developer I want to have HA enabled for routers that are part or a redundant network or VPCThis PR fixes the issue we were facing with crashed redundant routers not being picked up by the HA monitor due to an IF statement in the code.

* Redundant Routers are not the same as Haigh Available. Having a router HA is actually saying that the given router will be controlled by the High Availability monitor. Hence fix any problem we might face.

* pr/1222:
  CLOUDSTACK-4374 - Adds HA capabilities to redundant routers

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-12-12 09:53:00 +01:00
parent 66d7f413e8 0d075906ad
commit 2071a9e395
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/network/router/NetworkHelperImpl.java
View File

@ -472,14 +472,7 @@ public class NetworkHelperImpl implements NetworkHelper {
continue;
}
boolean offerHA = routerOffering.getOfferHA();
/*
* We don't provide HA to redundant router VMs, admin should own
* it all, and redundant router themselves are HA
*/
if (routerDeploymentDefinition.isRedundant()) {
offerHA = false;
}
final boolean offerHA = routerOffering.getOfferHA();
// routerDeploymentDefinition.getVpc().getId() ==> do not use
// VPC because it is not a VPC offering.
@ -487,7 +480,7 @@ public class NetworkHelperImpl implements NetworkHelper {
long userId = CallContext.current().getCallingUserId();
if (CallContext.current().getCallingAccount().getId() != owner.getId()) {
List<UserVO> userVOs = _userDao.listByAccount(owner.getAccountId());
final List<UserVO> userVOs = _userDao.listByAccount(owner.getAccountId());
if (!userVOs.isEmpty()) {
userId = userVOs.get(0).getId();
}