You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/10/25 10:34:14 UTC
[1/3] git commit: updated refs/heads/master to 99bb500
Repository: cloudstack
Updated Branches:
refs/heads/master af8b223fd -> 99bb50072
Remove dangerous prototype of applyConfigToVR
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ddfc3681
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ddfc3681
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ddfc3681
Branch: refs/heads/master
Commit: ddfc368117a3548cdf198d4f19f484365cf99aa8
Parents: 5d4b5fd
Author: Aaron Brady <aa...@insom.me.uk>
Authored: Sat Mar 26 00:38:57 2016 +0000
Committer: Aaron Brady <aa...@insom.me.uk>
Committed: Sat Mar 26 00:39:04 2016 +0000
----------------------------------------------------------------------
.../resource/virtualnetwork/VirtualRoutingResource.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddfc3681/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index f271e72..2d22b14 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -152,11 +152,10 @@ public class VirtualRoutingResource {
}
}
- private ExecutionResult applyConfigToVR(String routerAccessIp, ConfigItem c) {
- return applyConfigToVR(routerAccessIp, c, VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT);
- }
-
private ExecutionResult applyConfigToVR(String routerAccessIp, ConfigItem c, int timeout) {
+ if (timeout < VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT) {
+ timeout = VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT;
+ }
if (c instanceof FileConfigItem) {
FileConfigItem configItem = (FileConfigItem)c;
return _vrDeployer.createFileInVR(routerAccessIp, configItem.getFilePath(), configItem.getFileName(), configItem.getFileContents());
@@ -180,7 +179,7 @@ public class VirtualRoutingResource {
boolean finalResult = false;
for (ConfigItem configItem : cfg) {
long startTimestamp = System.currentTimeMillis();
- ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem);
+ ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), configItem, VRScripts.DEFAULT_EXECUTEINVR_TIMEOUT);
if (s_logger.isDebugEnabled()) {
long elapsed = System.currentTimeMillis() - startTimestamp;
s_logger.debug("Processing " + configItem + " took " + elapsed + "ms");
@@ -375,9 +374,6 @@ public class VirtualRoutingResource {
ScriptConfigItem scriptConfigItem = new ScriptConfigItem(VRScripts.VR_CFG, "-c " + VRScripts.CONFIG_CACHE_LOCATION + cfgFileName);
// 120s is the minimal timeout
int timeout = answerCounts * _eachTimeout;
- if (timeout < 120) {
- timeout = 120;
- }
ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem, timeout);
if (!result.isSuccess()) {
[3/3] git commit: updated refs/heads/master to 99bb500
Posted by ra...@apache.org.
Merge pull request #1451 from insom/CLOUDSTACK-9319
CLOUDSTACK-9319: Use timeout when applying config to virtual routerFrom the [JIRA issue](https://issues.apache.org/jira/browse/CLOUDSTACK-9319):
> The timeout parameter is not passed down to `applyConfigToVR` inside `VirtualRoutingResource` in all cases.
>
> This timeout is worked out as 3 seconds per command or 120 seconds (whichever is larger), but because it's not passed to the first invocation, the default (120 seconds, DEFAULT_EXECUTEINVR_TIMEOUT) is used.
>
> In a recent upgrade of our Virtual Routers, the timeout was being hit and increasing `router.aggregation.command.each.timeout` had no effect. I built a custom 4.8 agent with the timeout increased to allow the upgrade to continue.
* pr/1451:
Remove dangerous prototype of applyConfigToVR
Use timeout when applying config to virtual router
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99bb5007
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99bb5007
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99bb5007
Branch: refs/heads/master
Commit: 99bb50072def07769d26440b269c7668ac12ee2c
Parents: af8b223 ddfc368
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Oct 25 16:03:34 2016 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Oct 25 16:03:34 2016 +0530
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 99bb500
Posted by ra...@apache.org.
Use timeout when applying config to virtual router
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d4b5fd6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d4b5fd6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d4b5fd6
Branch: refs/heads/master
Commit: 5d4b5fd642d250f45ec62ea7f28577d885e3665a
Parents: 5251eed
Author: Aaron Brady <aa...@iweb.co.uk>
Authored: Wed Mar 23 12:15:24 2016 +0000
Committer: Aaron Brady <aa...@insom.me.uk>
Committed: Sat Mar 26 00:39:04 2016 +0000
----------------------------------------------------------------------
.../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d4b5fd6/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index f3edc69..f271e72 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -379,7 +379,7 @@ public class VirtualRoutingResource {
timeout = 120;
}
- ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem);
+ ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem, timeout);
if (!result.isSuccess()) {
return new Answer(cmd, false, result.getDetails());
}