You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/03/31 20:29:37 UTC
git commit: updated refs/heads/4.4 to c388afc
Repository: cloudstack
Updated Branches:
refs/heads/4.4 fe0c9768c -> c388afc8c
CLOUDSTACK-6309: Fix timeout in KVM when execute VR commands
Timeout is in seconds rather than milliseconds.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c388afc8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c388afc8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c388afc8
Branch: refs/heads/4.4
Commit: c388afc8cd52d704e3f9a3593fe6639aa9aa75f5
Parents: fe0c976
Author: Sheng Yang <sh...@citrix.com>
Authored: Mon Mar 31 11:16:09 2014 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Mar 31 11:29:02 2014 -0700
----------------------------------------------------------------------
.../agent/resource/virtualnetwork/VirtualRouterDeployer.java | 1 +
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c388afc8/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
index 07fa1fb..1feaaea 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
@@ -21,6 +21,7 @@ import com.cloud.utils.ExecutionResult;
public interface VirtualRouterDeployer {
ExecutionResult executeInVR(String routerIp, String script, String args);
+ /* timeout in seconds */
ExecutionResult executeInVR(String routerIp, String script, String args, int timeout);
ExecutionResult createFileInVR(String routerIp, String path, String filename, String content);
ExecutionResult prepareCommand(NetworkElementCommand cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c388afc8/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 33d158b..beb5e10 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -331,12 +331,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
@Override
public ExecutionResult executeInVR(String routerIp, String script, String args) {
- return executeInVR(routerIp, script, args, _timeout);
+ return executeInVR(routerIp, script, args, _timeout / 1000);
}
@Override
public ExecutionResult executeInVR(String routerIp, String script, String args, int timeout) {
- final Script command = new Script(_routerProxyPath, timeout, s_logger);
+ final Script command = new Script(_routerProxyPath, timeout * 1000, s_logger);
final AllLinesParser parser = new AllLinesParser();
command.add(script);
command.add(routerIp);