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

Merge pull request #2135 from shapeblue/force-stop-vm-kvm 

[BLOCKER] CLOUDSTACK-9860: Fix stackoverflow issue
This commit is contained in:
Rajani Karuturi 2017-06-07 11:04:32 +05:30 committed by GitHub
parent 48f413a982 e197652a28
commit 52232b92a0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2733,7 +2733,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (forceStop) {
return stopVMInternal(conn, vmName, true);
}
String ret = stopVM(conn, vmName, false);
String ret = stopVMInternal(conn, vmName, false);
if (ret == Script.ERR_TIMEOUT) {
ret = stopVMInternal(conn, vmName, true);
} else if (ret != null) {