mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge branch '4.16'
This commit is contained in:
commit
65dc2df896
@ -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
|
||||
# host.cpu.manual.speed.mhz=0
|
||||
|
||||
# Enable/disable IO driver for Qemu / It's enabled by default on KVM agents
|
||||
# enable.io.uring=true
|
||||
|
||||
@ -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);
|
||||
|
||||
/**
|
||||
* 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>{
|
||||
private final String name;
|
||||
private final T defaultValue;
|
||||
|
||||
@ -2994,7 +2994,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
|
||||
* (ii) Libvirt >= 6.3.0
|
||||
*/
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user