diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties index daad05f3b656..8b99ee364661 100644 --- a/agent/conf/agent.properties +++ b/agent/conf/agent.properties @@ -152,3 +152,7 @@ hypervisor.type=kvm # kvmclock.disable=false # Some newer linux kernels are incapable of reliably migrating vms with kvmclock # This is a workaround for the bug, admin can set this to true per-host +# +#router.aggregation.command.each.timeout=600 +#timeout value for aggregation commands send to virtual router +# diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 87a38d3e39fb..24517cba5f2e 100644 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -272,7 +272,10 @@ public boolean configure(final String name, final Map 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()); + } 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); diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index b5d67c7a589f..58d9d33f447a 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/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 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 sc = _hostDao.createSearchCriteria(); sc.addAnd("status", SearchCriteria.Op.EQ, Status.Up.toString());