Skip to content

CLOUDSTACK-9569: add router.aggregation.command.each.timeout to agent… #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Jul 27, 2017
Merged

CLOUDSTACK-9569: add router.aggregation.command.each.timeout to agent… #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions agent/conf/agent.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
9 changes: 6 additions & 3 deletions core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ 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()));
Copy link
Member

@yadvr yadvr Jul 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@borisstoyanov however this fix makes sense to use the default value when not parse-able.

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!");
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions server/src/com/cloud/server/StatsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down