CLOUDSTACK-9569: add router.aggregation.command.each.timeout to agent properties

Author: Abhinandan Prateek

core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java

@@ -42,7 +42,7 @@ public class VRScripts {
     public static final String LOAD_BALANCER_CONFIG = "load_balancer.json";
 
     public final static String CONFIG_CACHE_LOCATION = "/var/cache/cloud/";
-    public final static Duration VR_SCRIPT_EXEC_TIMEOUT = Duration.standardMinutes(2);
+    public final static Duration VR_SCRIPT_EXEC_TIMEOUT = Duration.standardMinutes(10);
     public final static Duration CONNECTION_TIMEOUT = Duration.standardMinutes(1);
 
     // New scripts for use with chef

core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

@@ -272,7 +272,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
         _port = NumbersUtil.parseInt(value, 3922);
 
         value = (String)params.get("router.aggregation.command.each.timeout");
-        _eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt(value, 10));
+        _eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt(value, (int)VRScripts.VR_SCRIPT_EXEC_TIMEOUT.getStandardSeconds()));
         if (s_logger.isDebugEnabled()){
             s_logger.debug("The router.aggregation.command.each.timeout in seconds is set to " + _eachTimeout.getStandardSeconds());
         }

server/src/com/cloud/server/StatsCollector.java

@@ -439,7 +439,7 @@ class HostOutOfBandManagementStatsCollector extends ManagedContextRunnable {
         @Override
         protected void runInContext() {
             try {
-                s_logger.debug("HostOutOfBandManagementStatsCollector is running...");
+                s_logger.trace("HostOutOfBandManagementStatsCollector is running...");
                 List<OutOfBandManagementVO> outOfBandManagementHosts = outOfBandManagementDao.findAllByManagementServer(ManagementServerNode.getManagementServerId());
                 if (outOfBandManagementHosts == null) {
                     return;
@@ -469,7 +469,7 @@ class VmStatsCollector extends ManagedContextRunnable {
         @Override
         protected void runInContext() {
             try {
-                s_logger.debug("VmStatsCollector is running...");
+                s_logger.trace("VmStatsCollector is running...");
 
                 SearchCriteria<HostVO> sc = _hostDao.createSearchCriteria();
                 sc.addAnd("status", SearchCriteria.Op.EQ, Status.Up.toString());