From c388afc8cd52d704e3f9a3593fe6639aa9aa75f5 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 31 Mar 2014 11:16:09 -0700 Subject: [PATCH] CLOUDSTACK-6309: Fix timeout in KVM when execute VR commands Timeout is in seconds rather than milliseconds. --- .../agent/resource/virtualnetwork/VirtualRouterDeployer.java | 1 + .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java index 07fa1fb2009..1feaaead9f0 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); 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 33d158bbda3..beb5e10fd34 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);