cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/5] git commit: updated refs/heads/feature/systemvm-persistent-config to a118e1b
Date Thu, 05 Feb 2015 16:03:02 GMT
Fix the router id on the virtural routers
   - Using the VPC id, it is reliable.
   - Tested stopping/destroying/creating a router and VRRP is pretty happy


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bb63fd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bb63fd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bb63fd3

Branch: refs/heads/feature/systemvm-persistent-config
Commit: 3bb63fd31750258ac1eac916c58aa78b7293cc6f
Parents: 718fd89
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Thu Feb 5 10:06:02 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Thu Feb 5 10:06:02 2015 +0100

----------------------------------------------------------------------
 .../router/VirtualNetworkApplianceManagerImpl.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bb63fd3/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 5bca748..61fa918 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -693,13 +693,13 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
         }
 
         // We cannot schedule a job at specific time. Provide initial delay instead, from
current time, so that the job runs at desired time
-        long initialDelay = aggDate - System.currentTimeMillis();
+        final long initialDelay = aggDate - System.currentTimeMillis();
 
         if( initialDelay < 0){
             s_logger.warn("Initial delay for network usage stats update task is incorrect.
Stats update task will run immediately");
         }
 
-        _networkStatsUpdateExecutor.scheduleAtFixedRate(new NetworkStatsUpdateTask(), initialDelay,
(_usageAggregationRange * 60 * 1000),
+        _networkStatsUpdateExecutor.scheduleAtFixedRate(new NetworkStatsUpdateTask(), initialDelay,
_usageAggregationRange * 60 * 1000,
                 TimeUnit.MILLISECONDS);
 
         if (_routerCheckInterval > 0) {
@@ -1595,6 +1595,9 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
             final List<DomainRouterVO> routers;
             if (vpcId != null) {
                 routers = _routerDao.listByVpcId(vpcId);
+                // For a redundant VPC router, both shall have the same router id. It will
be used by the VRRP virtural_router_id attribute.
+                // So we use the VPC id to avoid group problems.
+                buf.append(" router_id=").append(vpcId);
             } else {
                 routers = _routerDao.listByNetworkAndRole(nic.getNetworkId(), Role.VIRTUAL_ROUTER);
             }
@@ -1604,14 +1607,8 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
             if (routers.size() == 0) {
                 redundantState = RedundantState.MASTER.toString();
                 router.setRedundantState(RedundantState.MASTER);
-
-                buf.append(" router_id=").append(router.getId());
             } else {
                 final DomainRouterVO router0 = routers.get(0);
-
-                //For a redundant router, both shall have the same router id. It will be
used by the VRRP virtural_router_id attribute.
-                buf.append(" router_id=").append(router0.getId());
-
                 if (router.getId() == router0.getId()) {
                     redundantState = RedundantState.MASTER.toString();
                     router.setRedundantState(RedundantState.MASTER);


Mime
View raw message