From 9a21f56f8a0f4e57ecfe03ed3ecde3ddac58be28 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Sat, 7 May 2016 18:56:58 +0200 Subject: [PATCH 1/5] Speedup vm start by making vm_passwd saving much faster - do not keep passwords in databag (/etc/cloudstack/vmpasswd.json) - process only the password we get in (vm_password.json) from mgt server - lookup the correct passwd server instead of adding passwd to all of them Example: - 4 tiers and 199 VMs running - Start vm 200 would cause new passwd from vm_password.json (1) to be merged with /etc/cloudstack/vmpasswd.json (199) - A curl command was exected foreach password (200) foreach tier (4) resulting in 800 calls - In fact, since passwds are never cleaned it could very well be even more as the ip address was the key in the json file so until the ip address was reused the original password would remain and be sent to passwd server every time another vm starts. - This took ~40 seconds Now we just figure out the right tier and only process the new password resulting in a single curl call. - takes 0,03 seconds! --- .../config/opt/cloud/bin/cs/CsVmPassword.py | 45 +++++++++++++++++++ .../debian/config/opt/cloud/bin/cs_vmp.py | 27 ----------- 2 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py delete mode 100755 systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py new file mode 100644 index 00000000000..279d21d3298 --- /dev/null +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py @@ -0,0 +1,45 @@ +#!/usr/bin/python +# -- coding: utf-8 -- + +import CsHelper +from CsProcess import CsProcess +from netaddr import IPNetwork, IPAddress +import logging + + +class CsPassword: + + TOKEN_FILE="/tmp/passwdsrvrtoken" + + def __init__(self, dbag): + self.dbag = dbag + self.process() + + def process(self): + self.__update(self.dbag['ip_address'], self.dbag['password']) + + def __update(self, vm_ip, password): + token = "" + try: + tokenFile = open(self.TOKEN_FILE) + token = tokenFile.read() + except IOError: + logging.debug("File %s does not exist" % self.TOKEN_FILE) + + logging.debug("Got VM '%s' and password '%s'" % (vm_ip, password)) + get_cidrs_cmd = "ip addr show | grep inet | grep -v secondary | awk '{print $2}'" + cidrs = CsHelper.execute(get_cidrs_cmd) + logging.debug("Found these CIDRs: %s" % cidrs) + for cidr in cidrs: + logging.debug("Processing CIDR '%s'" % cidr) + if IPAddress(vm_ip) in IPNetwork(cidr): + ip = cidr.split('/')[0] + logging.debug("Cidr %s matches vm ip address %s so adding passwd to passwd server at %s" % (cidr, vm_ip, ip)) + proc = CsProcess(['/opt/cloud/bin/passwd_server_ip.py', ip]) + if proc.find(): + update_command = 'curl --header "DomU_Request: save_password" "http://{SERVER_IP}:8080/" -F "ip={VM_IP}" -F "password={PASSWORD}" ' \ + '-F "token={TOKEN}" --interface 127.0.0.1 >/dev/null 2>/dev/null &'.format(SERVER_IP=ip, VM_IP=vm_ip, PASSWORD=password, TOKEN=token) + result = CsHelper.execute(update_command) + logging.debug("Update password server result ==> %s" % result) + else: + logging.debug("Update password server skipped because we didn't find a passwd server process for %s (makes sense on backup routers)" % ip) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py deleted file mode 100755 index 3a8e06ed719..00000000000 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py +++ /dev/null @@ -1,27 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -from pprint import pprint -from netaddr import * - - -def merge(dbag, data): - """ - Track vm passwords - """ - dbag[data['ip_address']] = data['password'] - return dbag From 00add837494f0cadf6bce46ce33d0b35e95610ce Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Sat, 6 May 2017 22:12:36 +0200 Subject: [PATCH 2/5] remaining conflicting code for vm_passwd speedup --- .../debian/config/opt/cloud/bin/configure.py | 30 ------------------- .../debian/config/opt/cloud/bin/merge.py | 20 ++++++------- .../config/opt/cloud/bin/update_config.py | 22 +++++++++++++- 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index bdcfec9ade8..ff5d3ed4419 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py @@ -45,36 +45,6 @@ from cs.CsProcess import CsProcess from cs.CsStaticRoutes import CsStaticRoutes -class CsPassword(CsDataBag): - - TOKEN_FILE="/tmp/passwdsrvrtoken" - - def process(self): - for item in self.dbag: - if item == "id": - continue - self.__update(item, self.dbag[item]) - - def __update(self, vm_ip, password): - token = "" - try: - tokenFile = open(self.TOKEN_FILE) - token = tokenFile.read() - except IOError: - logging.debug("File %s does not exist" % self.TOKEN_FILE) - - ips_cmd = "ip addr show | grep inet | awk '{print $2}'" - ips = CsHelper.execute(ips_cmd) - for ip in ips: - server_ip = ip.split('/')[0] - proc = CsProcess(['/opt/cloud/bin/passwd_server_ip.py', server_ip]) - if proc.find(): - update_command = 'curl --header "DomU_Request: save_password" "http://{SERVER_IP}:8080/" -F "ip={VM_IP}" -F "password={PASSWORD}" ' \ - '-F "token={TOKEN}" >/dev/null 2>/dev/null &'.format(SERVER_IP=server_ip, VM_IP=vm_ip, PASSWORD=password, TOKEN=token) - result = CsHelper.execute(update_command) - logging.debug("Update password server result ==> %s" % result) - - class CsAcl(CsDataBag): """ Deal with Network acls diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py index 50d9ee9aae8..e6ca8586eea 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py @@ -23,7 +23,6 @@ import logging import cs_ip import cs_guestnetwork import cs_cmdline -import cs_vmp import cs_network_acl import cs_firewallrules import cs_loadbalancer @@ -36,8 +35,6 @@ import cs_remoteaccessvpn import cs_vpnusers import cs_staticroutes -from pprint import pprint - class DataBag: @@ -105,8 +102,6 @@ class updateDataBag: dbag = self.processGuestNetwork(self.db.getDataBag()) elif self.qFile.type == 'cmdline': dbag = self.processCL(self.db.getDataBag()) - elif self.qFile.type == 'vmpassword': - dbag = self.processVMpassword(self.db.getDataBag()) elif self.qFile.type == 'networkacl': dbag = self.process_network_acl(self.db.getDataBag()) elif self.qFile.type == 'firewallrules': @@ -188,9 +183,6 @@ class updateDataBag: def process_staticroutes(self, dbag): return cs_staticroutes.merge(dbag, self.qFile.data) - def processVMpassword(self, dbag): - return cs_vmp.merge(dbag, self.qFile.data) - def processForwardingRules(self, dbag): # to be used by both staticnat and portforwarding return cs_forwardingrules.merge(dbag, self.qFile.data) @@ -275,13 +267,21 @@ class QueueFile: fileName = '' configCache = "/var/cache/cloud" keep = True + do_merge = True data = {} + def update_databag(self): + if self.do_merge: + logging.info("Merging because do_merge is %s" % self.do_merge) + updateDataBag(self) + else: + logging.info("Not merging because do_merge is %s" % self.do_merge) + def load(self, data): if data is not None: self.data = data self.type = self.data["type"] - proc = updateDataBag(self) + self.update_databag() return fn = self.configCache + '/' + self.fileName try: @@ -296,7 +296,7 @@ class QueueFile: self.__moveFile(fn, self.configCache + "/processed") else: os.remove(fn) - proc = updateDataBag(self) + self.update_databag() def setFile(self, name): self.fileName = name diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py index dddd0c8e3c0..9ec3f872785 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py @@ -25,6 +25,7 @@ import os import os.path import configure import json +from cs.CsVmPassword import * logging.basicConfig(filename='/var/log/cloud.log', level=logging.DEBUG, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s') @@ -45,15 +46,30 @@ def finish_config(): sys.exit(returncode) -def process_file(): +def process(do_merge=True): print "[INFO] Processing JSON file %s" % sys.argv[1] qf = QueueFile() qf.setFile(sys.argv[1]) + qf.do_merge = do_merge qf.load(None) + + return qf + + +def process_file(): + print "[INFO] process_file" + qf = process() # Converge finish_config() +def process_vmpasswd(): + print "[INFO] process_vmpassword" + qf = process(False) + print "[INFO] Sending password to password server" + CsPassword(qf.getData()) + + def is_guestnet_configured(guestnet_dict, keys): existing_keys = [] @@ -135,6 +151,10 @@ if sys.argv[1] == "guest_network.json": else: print "[INFO] update_config.py :: No GuestNetwork configured yet. Configuring first one now." process_file() +# Bypass saving passwords and running full config/convergence, just feed passwd to passwd server and stop +elif sys.argv[1].startswith("vm_password.json"): + print "[INFO] update_config.py :: Processing incoming vm_passwd file => %s" % sys.argv[1] + process_vmpasswd() else: print "[INFO] update_config.py :: Processing incoming file => %s" % sys.argv[1] process_file() From 710d3bff3f9676aa59a5a960489072ca2b4729d6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 8 May 2017 07:42:04 +0200 Subject: [PATCH 3/5] rat --- .../config/opt/cloud/bin/cs/CsVmPassword.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py index 279d21d3298..1376093c81a 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsVmPassword.py @@ -1,5 +1,21 @@ #!/usr/bin/python # -- coding: utf-8 -- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. import CsHelper from CsProcess import CsProcess From 8323a175f138137d8eb4a81835054bbc04838901 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 16 May 2017 14:57:26 +0530 Subject: [PATCH 4/5] CLOUDSTACK-9860: Power off VMs when stopVM is called with forced=true The 'force' option provided with the stopVirtualMachine API command is often assumed to be a hard shutdown sent to the hypervisor, when in fact it is for CloudStacks' internal use. CloudStack should be able to send the 'hard' power-off request to the hosts. When forced parameter on the stopVM API is true, power off (hard shutdown) a VM. This uses initial changes from #1635 to pass the forced parameter to hypervisor plugin via the StopCommand, and fixes force stop (poweroff) handling for KVM, VMware and XenServer. Signed-off-by: Rohit Yadav --- .../api/command/user/vm/StopVMCmd.java | 2 +- core/src/com/cloud/agent/api/StopCommand.java | 11 ++++++ .../cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../resource/LibvirtComputingResource.java | 13 ++++--- .../wrapper/LibvirtStopCommandWrapper.java | 3 +- .../vmware/resource/VmwareResource.java | 15 +++++--- .../resource/CitrixResourceBase.java | 11 ++++-- .../xenbase/CitrixStopCommandWrapper.java | 2 +- test/integration/smoke/test_vm_life_cycle.py | 36 ++++++++++++++++++- 9 files changed, 77 insertions(+), 18 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java index ece41b8dcc2..5b2f0208e0b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java @@ -54,7 +54,7 @@ public class StopVMCmd extends BaseAsyncCmd { private Long id; @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force stop the VM " - + "(vm is marked as Stopped even when command fails to be send to the backend). The caller knows the VM is stopped.") + + "(vm is marked as Stopped even when command fails to be send to the backend, otherwise a force poweroff is attempted). The caller knows the VM is stopped.") private Boolean forced; // /////////////////////////////////////////////////// diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java index b723d746cc3..869af3a7f4a 100644 --- a/core/src/com/cloud/agent/api/StopCommand.java +++ b/core/src/com/cloud/agent/api/StopCommand.java @@ -28,6 +28,7 @@ public class StopCommand extends RebootCommand { private String publicConsoleProxyIpAddress = null; private GPUDeviceTO gpuDevice; boolean checkBeforeCleanup = false; + boolean forceStop = false; protected StopCommand() { } @@ -45,6 +46,12 @@ public class StopCommand extends RebootCommand { this.checkBeforeCleanup = checkBeforeCleanup; } + public StopCommand(VirtualMachine vm, boolean executeInSequence, boolean checkBeforeCleanup, boolean forceStop) { + super(vm.getInstanceName(), executeInSequence); + this.checkBeforeCleanup = checkBeforeCleanup; + this.forceStop = forceStop; + } + public StopCommand(String vmName, boolean executeInSequence, boolean checkBeforeCleanup) { super(vmName, executeInSequence); this.checkBeforeCleanup = checkBeforeCleanup; @@ -82,4 +89,8 @@ public class StopCommand extends RebootCommand { public boolean checkBeforeCleanup() { return this.checkBeforeCleanup; } + + public boolean isForceStop() { + return forceStop; + } } diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 03a37987752..dfc48d5ccd6 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1536,7 +1536,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac vmGuru.prepareStop(profile); - final StopCommand stop = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()), false); + final StopCommand stop = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()), false, cleanUpEvenIfUnableToStop); boolean stopped = false; Answer answer = null; 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 c26c3e2bef1..7a3f93667ef 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2703,7 +2703,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } } s_logger.debug(vmDef); - msg = stopVM(conn, vmName); + msg = stopVM(conn, vmName, false); msg = startVM(conn, vmName, vmDef); return null; } catch (final LibvirtException e) { @@ -2725,14 +2725,17 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return msg; } - public String stopVM(final Connect conn, final String vmName) { + public String stopVM(final Connect conn, final String vmName, final boolean forceStop) { DomainState state = null; Domain dm = null; s_logger.debug("Try to stop the vm at first"); + if (forceStop) { + return stopVMInternal(conn, vmName, true); + } String ret = stopVM(conn, vmName, false); if (ret == Script.ERR_TIMEOUT) { - ret = stopVM(conn, vmName, true); + ret = stopVMInternal(conn, vmName, true); } else if (ret != null) { /* * There is a race condition between libvirt and qemu: libvirt @@ -2765,7 +2768,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv if (state != DomainState.VIR_DOMAIN_SHUTOFF) { s_logger.debug("Try to destroy the vm"); - ret = stopVM(conn, vmName, true); + ret = stopVMInternal(conn, vmName, true); if (ret != null) { return ret; } @@ -2775,7 +2778,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return null; } - protected String stopVM(final Connect conn, final String vmName, final boolean force) { + protected String stopVMInternal(final Connect conn, final String vmName, final boolean force) { Domain dm = null; try { dm = conn.domainLookupByName(vmName); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java index f7e088bfd23..feec1c339d9 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java @@ -67,7 +67,8 @@ public final class LibvirtStopCommandWrapper extends CommandWrapper ifaces = libvirtComputingResource.getInterfaces(conn, vmName); libvirtComputingResource.destroyNetworkRulesForVM(conn, vmName); - final String result = libvirtComputingResource.stopVM(conn, vmName); + final String result = libvirtComputingResource.stopVM(conn, vmName, command.isForceStop()); + if (result == null) { for (final DiskDef disk : disks) { libvirtComputingResource.cleanupDisk(disk); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 56ca4ea0966..10f0fd32a8d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3150,13 +3150,18 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.setCustomFieldValue(CustomFieldConstants.CLOUD_VM_INTERNAL_NAME, cmd.getVmName()); if (getVmPowerState(vmMo) != PowerState.PowerOff) { - if (vmMo.safePowerOff(_shutdownWaitMs)) { - return new StopAnswer(cmd, "Stop VM " + cmd.getVmName() + " Succeed", true); + String msg = "Stop VM " + cmd.getVmName() + " Succeed"; + boolean success = false; + if (cmd.isForceStop()) { + success = vmMo.powerOff(); } else { - String msg = "Have problem in powering off VM " + cmd.getVmName() + ", let the process continue"; - s_logger.warn(msg); - return new StopAnswer(cmd, msg, true); + success = vmMo.safePowerOff(_shutdownWaitMs); } + if (!success) { + msg = "Have problem in powering off VM " + cmd.getVmName() + ", let the process continue"; + s_logger.warn(msg); + } + return new StopAnswer(cmd, msg, true); } String msg = "VM " + cmd.getVmName() + " is already in stopped state"; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index ca8a645532e..54840396d5f 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -4862,10 +4862,15 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return null; } - public void shutdownVM(final Connection conn, final VM vm, final String vmName) throws XmlRpcException { + public void shutdownVM(final Connection conn, final VM vm, final String vmName, final boolean forcedStop) throws XmlRpcException { Task task = null; try { - task = vm.cleanShutdownAsync(conn); + if (forcedStop) { + task = vm.hardShutdownAsync(conn); + } else { + task = vm.cleanShutdownAsync(conn); + } + try { // poll every 1 seconds , timeout after 10 minutes waitForTask(conn, task, 1000, 10 * 60 * 1000); @@ -4878,7 +4883,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe throw new CloudRuntimeException("Shutdown VM catch HandleInvalid and VM is not in HALTED state"); } } catch (final XenAPIException e) { - s_logger.debug("Unable to cleanShutdown VM(" + vmName + ") on host(" + _host.getUuid() + ") due to " + e.toString()); + s_logger.debug("Unable to shutdown VM(" + vmName + ") with force=" + forcedStop + " on host(" + _host.getUuid() + ") due to " + e.toString()); try { VmPowerState state = vm.getPowerState(conn); if (state == VmPowerState.RUNNING) { diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java index af94d83858a..42d7d3bcb01 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java @@ -113,7 +113,7 @@ public final class CitrixStopCommandWrapper extends CommandWrapper Date: Tue, 6 Jun 2017 16:13:05 +0530 Subject: [PATCH 5/5] CLOUDSTACK-9860: Fix stackoverflow issue Fixes issue caused to a PR-refactoring from #2108, reported by @borisstoyanov Signed-off-by: Rohit Yadav --- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7a3f93667ef..c88400b289c 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -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) {