etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6309: Fix timeout in KVM when execute VR commands 

Timeout is in seconds rather than milliseconds.
This commit is contained in:
Sheng Yang 2014-03-31 11:16:09 -07:00
parent 1577e75a3d
commit b2ffd86570
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
View File

@ -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);

4
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -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);