You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 09:53:18 UTC
[1/2] git commit: updated refs/heads/master to 2071a9e
Repository: cloudstack
Updated Branches:
refs/heads/master 66d7f413e -> 2071a9e39
CLOUDSTACK-4374 - Adds HA capabilities to redundant routers
- 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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d075906
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d075906
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d075906
Branch: refs/heads/master
Commit: 0d075906ad40b0bd681ece777045684379ba93a5
Parents: 312b9af
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Fri Dec 11 07:51:22 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Fri Dec 11 07:51:22 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/router/NetworkHelperImpl.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d075906/server/src/com/cloud/network/router/NetworkHelperImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/NetworkHelperImpl.java b/server/src/com/cloud/network/router/NetworkHelperImpl.java
index 302a9f1..f396fdd 100644
--- a/server/src/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/com/cloud/network/router/NetworkHelperImpl.java
@@ -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();
}
[2/2] git commit: updated refs/heads/master to 2071a9e
Posted by re...@apache.org.
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 <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2071a9e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2071a9e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2071a9e3
Branch: refs/heads/master
Commit: 2071a9e395841a896f9cef3d80aa9b31822d8fa7
Parents: 66d7f41 0d07590
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 09:53:00 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 09:53:00 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/router/NetworkHelperImpl.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------