apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.16'

Browse Source
This commit is contained in:
nvazquez 2022-04-13 08:45:48 -03:00
commit 65dc2df896
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/conf/agent.properties
View File

@ -288,3 +288,6 @@ iscsi.session.cleanup.enabled=false
# Manually set the host CPU MHz, in cases where CPU scaling support detected value is wrong # Manually set the host CPU MHz, in cases where CPU scaling support detected value is wrong
# host.cpu.manual.speed.mhz=0 # host.cpu.manual.speed.mhz=0
# Enable/disable IO driver for Qemu / It's enabled by default on KVM agents
# enable.io.uring=true

7
agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
View File

@ -54,6 +54,13 @@ public class AgentProperties{
*/ */
public static final Property<Boolean> ENABLE_MANUALLY_SETTING_CPU_TOPOLOGY_ON_KVM_VM = new Property<Boolean>("enable.manually.setting.cpu.topology.on.kvm.vm", true); public static final Property<Boolean> ENABLE_MANUALLY_SETTING_CPU_TOPOLOGY_ON_KVM_VM = new Property<Boolean>("enable.manually.setting.cpu.topology.on.kvm.vm", true);
/**
* Enable manually IO driver on KVM's VM. <br>
* Data type: boolean.<br>
* Default value: true.
*/
public static final Property<Boolean> ENABLE_IO_URING = new Property<Boolean>("enable.io.uring", true);
public static class Property <T>{ public static class Property <T>{
private final String name; private final String name;
private final T defaultValue; private final T defaultValue;

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

@ -2994,7 +2994,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
* (ii) Libvirt >= 6.3.0 * (ii) Libvirt >= 6.3.0
*/ */
protected void setDiskIoDriver(DiskDef disk) { protected void setDiskIoDriver(DiskDef disk) {
if (getHypervisorLibvirtVersion() >= HYPERVISOR_LIBVIRT_VERSION_SUPPORTS_IO_URING && getHypervisorQemuVersion() >= HYPERVISOR_QEMU_VERSION_SUPPORTS_IO_URING) { if (getHypervisorLibvirtVersion() >= HYPERVISOR_LIBVIRT_VERSION_SUPPORTS_IO_URING
&& getHypervisorQemuVersion() >= HYPERVISOR_QEMU_VERSION_SUPPORTS_IO_URING
&& AgentPropertiesFileHandler.getPropertyValue(AgentProperties.ENABLE_IO_URING)) {
disk.setIoDriver(DiskDef.IoDriver.IOURING); disk.setIoDriver(DiskDef.IoDriver.IOURING);
} }
} }