CLOUDSTACK-9569: override default setting with values set in 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(10);
+    public final static Duration VR_SCRIPT_EXEC_TIMEOUT = Duration.standardMinutes(2);
     public final static Duration CONNECTION_TIMEOUT = Duration.standardMinutes(1);
 
     // New scripts for use with chef

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

@@ -273,6 +273,9 @@ public boolean configure(final String name, final Map<String, Object> params) th
 
         value = (String)params.get("router.aggregation.command.each.timeout");
         _eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt(value, 10));
+        if (s_logger.isDebugEnabled()){
+            s_logger.debug("The router.aggregation.command.each.timeout in seconds is set to " + _eachTimeout.getStandardSeconds());
+        }
 
         if (_vrDeployer == null) {
             throw new ConfigurationException("Unable to find the resource for VirtualRouterDeployer!");
@@ -376,8 +379,8 @@ private Answer execute(AggregationControlCommand cmd) {
                 ScriptConfigItem scriptConfigItem = new ScriptConfigItem(VRScripts.VR_CFG, "-c " + VRScripts.CONFIG_CACHE_LOCATION + cfgFileName);
                 // 120s is the minimal timeout
                 Duration timeout = _eachTimeout.withDurationAdded(_eachTimeout.getStandardSeconds(), answerCounts);
-                if (timeout.isShorterThan(VRScripts.VR_SCRIPT_EXEC_TIMEOUT)) {
-                    timeout = VRScripts.VR_SCRIPT_EXEC_TIMEOUT;
+                if (s_logger.isDebugEnabled()){
+                    s_logger.debug("Aggregate action timeout in seconds is " + timeout.getStandardSeconds());
                 }
 
                 ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem);