diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties index 1f2328e7eb3..6c7dba48c51 100644 --- a/agent/conf/agent.properties +++ b/agent/conf/agent.properties @@ -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 (in case it is not set CloudStack can also detect if its supported by qemu) +# enable.io.uring=true diff --git 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 index ef4f9bc1914..2e4bafd8864 100644 --- 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 @@ -313,6 +313,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv public final static String HOST_CACHE_PATH_PARAMETER = "host.cache.location"; public final static String CONFIG_DIR = "config"; + private boolean enableIoUring; + private final static String ENABLE_IO_URING_PROPERTY = "enable.io.uring"; public static final String BASH_SCRIPT_PATH = "/bin/bash"; @@ -1138,6 +1140,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv 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)) { _guestCpuArch = cpuArchOverride; @@ -2972,6 +2980,33 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return storagePool.getPhysicalDisk(data.getPath()); } + /** + * Check if IO_URING is supported by qemu + */ + protected boolean isIoUringSupportedByQemu() { + s_logger.debug("Checking if iouring is supported"); + String command = getIoUringCheckCommand(); + if (org.apache.commons.lang3.StringUtils.isBlank(command)) { + s_logger.debug("Could not check iouring support, disabling it"); + return false; + } + int exitValue = executeBashScriptAndRetrieveExitValue(command); + return exitValue == 0; + } + + protected String getIoUringCheckCommand() { + String[] qemuPaths = { "/usr/bin/qemu-system-x86_64", "/usr/libexec/qemu-kvm", "/usr/bin/qemu-kvm" }; + for (String qemuPath : qemuPaths) { + File file = new File(qemuPath); + if (file.exists()) { + String cmd = String.format("ldd %s | grep -Eqe '[[:space:]]liburing\\.so'", qemuPath); + s_logger.debug("Using the check command: " + cmd); + return cmd; + } + } + return null; + } + /** * Set Disk IO Driver, if supported by the Libvirt/Qemu version. * IO Driver works for: @@ -2979,11 +3014,34 @@ 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 (enableIoUring) { disk.setIoDriver(DiskDef.IoDriver.IOURING); } } + /** + * IO_URING supported if the property 'enable.io.uring' is set to true OR it is supported by qemu + */ + private boolean isIoUringEnabled(String enableIoUringConfig) { + boolean meetRequirements = getHypervisorLibvirtVersion() >= HYPERVISOR_LIBVIRT_VERSION_SUPPORTS_IO_URING + && getHypervisorQemuVersion() >= HYPERVISOR_QEMU_VERSION_SUPPORTS_IO_URING; + if (!meetRequirements) { + return false; + } + return enableIoUringConfig != null ? + Boolean.parseBoolean(enableIoUringConfig): + (isBaseOsUbuntu() || isIoUringSupportedByQemu()); + } + + private boolean isBaseOsUbuntu() { + Map versionString = getVersionStrings(); + String hostKey = "Host.OS"; + if (MapUtils.isEmpty(versionString) || !versionString.containsKey(hostKey) || versionString.get(hostKey) == null) { + return false; + } + return versionString.get(hostKey).equalsIgnoreCase("ubuntu"); + } + private KVMPhysicalDisk getPhysicalDiskFromNfsStore(String dataStoreUrl, DataTO data) { final String volPath = dataStoreUrl + File.separator + data.getPath(); final int index = volPath.lastIndexOf("/"); @@ -3847,10 +3905,20 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } private String executeBashScript(final String script) { + return createScript(script).execute(); + } + + private Script createScript(final String script) { final Script command = new Script("/bin/bash", _timeout, s_logger); command.add("-c"); command.add(script); - return command.execute(); + return command; + } + + private int executeBashScriptAndRetrieveExitValue(final String script) { + Script command = createScript(script); + command.execute(); + return command.getExitValue(); } public List getVmNetworkStat(Connect conn, String vmName) throws LibvirtException { diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index d8b1d4e289a..7c65f7970ad 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class LibvirtVMDef { @@ -1764,7 +1764,7 @@ public class LibvirtVMDef { graphicBuilder.append(" listen=''"); } if (_passwd != null) { - graphicBuilder.append(" passwd='" + _passwd + "'"); + graphicBuilder.append(" passwd='" + StringUtils.truncate(_passwd, 8) + "'"); } else if (_keyMap != null) { graphicBuilder.append(" _keymap='" + _keyMap + "'"); } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java index ab448df3009..ed3b0481819 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java @@ -149,7 +149,11 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper * @param xmlDesc the qemu xml description * @param target the ip address to migrate to + * @param vncPassword if set, the VNC password truncated to 8 characters * @return the new xmlDesc */ - String replaceIpForVNCInDescFile(String xmlDesc, final String target) { + String replaceIpForVNCInDescFileAndNormalizePassword(String xmlDesc, final String target, String vncPassword) { final int begin = xmlDesc.indexOf(GRAPHICS_ELEM_START); if (begin >= 0) { final int end = xmlDesc.lastIndexOf(GRAPHICS_ELEM_END) + GRAPHICS_ELEM_END.length(); @@ -460,6 +465,9 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper" + - " " + + " " + " " + " " + " " + @@ -588,22 +588,23 @@ public class LibvirtMigrateCommandWrapperTest { final String expectedXmlDesc = "" + " " + - " " + + " " + " " + " " + " " + ""; final String targetIp = "10.10.10.10"; - final String result = libvirtMigrateCmdWrapper.replaceIpForVNCInDescFile(xmlDesc, targetIp); + final String password = "12345678"; + final String result = libvirtMigrateCmdWrapper.replaceIpForVNCInDescFileAndNormalizePassword(xmlDesc, targetIp, password); assertTrue("transformation does not live up to expectation:\n" + result, expectedXmlDesc.equals(result)); } @Test - public void testReplaceFqdnForVNCInDesc() { + public void testReplaceFqdnAndPasswordForVNCInDesc() { final String xmlDesc = "" + " " + - " " + + " " + " " + " " + " " + @@ -611,13 +612,14 @@ public class LibvirtMigrateCommandWrapperTest { final String expectedXmlDesc = "" + " " + - " " + + " " + " " + " " + " " + ""; final String targetIp = "localhost.localdomain"; - final String result = libvirtMigrateCmdWrapper.replaceIpForVNCInDescFile(xmlDesc, targetIp); + final String password = "12345678"; + final String result = libvirtMigrateCmdWrapper.replaceIpForVNCInDescFileAndNormalizePassword(xmlDesc, targetIp, password); assertTrue("transformation does not live up to expectation:\n" + result, expectedXmlDesc.equals(result)); } @@ -789,5 +791,4 @@ public class LibvirtMigrateCommandWrapperTest { Assert.assertTrue(replaced.contains("csdpdk-7")); Assert.assertFalse(replaced.contains("csdpdk-1")); } - }