This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 96594aec285cf6d251dc71eabb6a7c9a753dd635 Merge: 40dabb6ee7 b1c8b5ab37 Author: nvazquez <[email protected]> AuthorDate: Mon May 23 08:16:52 2022 -0300 Merge branch '4.16' agent/conf/agent.properties | 2 +- .../cloud/agent/properties/AgentProperties.java | 7 -- .../kvm/resource/LibvirtComputingResource.java | 74 ++++++++++++++++++++-- .../wrapper/LibvirtMigrateCommandWrapper.java | 12 +++- .../wrapper/LibvirtMigrateCommandWrapperTest.java | 21 +++--- 5 files changed, 92 insertions(+), 24 deletions(-) diff --cc agent/conf/agent.properties index d2f87d66c1,e4468a1461..b877e97afa --- a/agent/conf/agent.properties +++ b/agent/conf/agent.properties @@@ -286,8 -286,5 +286,8 @@@ iscsi.session.cleanup.enabled=fals # Enable manually setting CPU's topology on KVM's VM. # enable.manually.setting.cpu.topology.on.kvm.vm=true +# Manually set the host CPU MHz, in cases where CPU scaling support detected value is wrong +# host.cpu.manual.speed.mhz=0 + - # Enable/disable IO driver for Qemu / It's enabled by default on KVM agents + # Enable/disable IO driver for Qemu (in case it is not set CloudStack can also detect if its supported by qemu) # enable.io.uring=true diff --cc plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index c743a78582,72e3e0027f..45072f436a --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@@ -1142,8 -1134,14 +1144,14 @@@ public class LibvirtComputingResource e s_logger.trace("Ignoring libvirt error.", e); } + // Enable/disable IO driver for Qemu (in case it is not set CloudStack can also detect if its supported by qemu) + // Do not remove - switching it to AgentProperties.Property may require accepting null values for the properties default value + String enableIoUringConfig = (String) params.get(ENABLE_IO_URING_PROPERTY); + enableIoUring = isIoUringEnabled(enableIoUringConfig); + s_logger.info("IO uring driver for Qemu: " + (enableIoUring ? "enabled" : "disabled")); + final String cpuArchOverride = (String)params.get("guest.cpu.arch"); - if (!Strings.isNullOrEmpty(cpuArchOverride)) { + if (StringUtils.isNotEmpty(cpuArchOverride)) { _guestCpuArch = cpuArchOverride; s_logger.info("Using guest CPU architecture: " + _guestCpuArch); }
