You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:10 UTC
[08/50] git commit: updated refs/heads/master to 3c429ee
Adding the router priority when the control interface is created
Adding some logging to the check heartbeat script
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7a14280
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7a14280
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7a14280
Branch: refs/heads/master
Commit: b7a142800d41668a3a8b78e49c458a5901f0fa92
Parents: e95a649
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Tue Jan 27 19:25:54 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:39:52 2015 +0100
----------------------------------------------------------------------
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 3 ++-
.../debian/config/opt/cloud/templates/check_heartbeat.sh.templ | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7a14280/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 1c32c7e..eb6496c 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1542,7 +1542,6 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
final String brd = NetUtils.long2Ip(NetUtils.ip2Long(guestNic.getIp4Address()) | ~NetUtils.ip2Long(guestNic.getNetmask()));
buf.append(" guestbrd=").append(brd);
buf.append(" guestcidrsize=").append(NetUtils.getCidrSize(guestNic.getNetmask()));
- buf.append(" router_pr=").append(router.getPriority());
final int advertInt = NumbersUtil.parseInt(_configDao.getValue(Config.RedundantRouterVrrpInterval.key()), 1);
buf.append(" advert_int=").append(advertInt);
@@ -1621,6 +1620,8 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
final int priority = getUpdatedPriority(network, routers, router);
router.setPriority(priority);
router = _routerDao.persist(router);
+
+ buf.append(" router_pr=").append(router.getPriority());
} catch (final InsufficientVirtualNetworkCapacityException e) {
s_logger.error("Failed to get update priority!", e);
throw new CloudRuntimeException("Failed to get update priority!");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7a14280/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ b/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ
index 2bfb7cd..4131159 100755
--- a/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ
+++ b/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ
@@ -38,6 +38,7 @@ then
if [ -e $STRIKE_FILE ]
then
rm $STRIKE_FILE
+ echo keepalived.strikes file was removed! >> $ROUTER_LOG
else
echo keepalived.strikes file does not exist! >> $ROUTER_LOG
fi