Repository: cloudstack Updated Branches: refs/heads/master 1577e75a3 -> b2ffd8657
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/b2ffd865 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2ffd865 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2ffd865 Branch: refs/heads/master Commit: b2ffd86570921fcc5bd538949a94ceef85014ba6 Parents: 1577e75 Author: Sheng Yang <[email protected]> Authored: Mon Mar 31 11:16:09 2014 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Mar 31 11:30:06 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/b2ffd865/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/b2ffd865/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);
