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 0f32fae934a..c45697482a0 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 @@ -3002,6 +3002,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv disk.setBusType(DiskDef.DiskBus.SCSI); } } else { + if (pool == null) { + throw new CloudRuntimeException(String.format("Found null pool for volume %s", volume)); + } + + disk.setLogicalBlockIOSize(pool.getSupportedLogicalBlockSize()); + disk.setPhysicalBlockIOSize(pool.getSupportedPhysicalBlockSize()); + if (diskBusType == DiskDef.DiskBus.SCSI ) { disk.setQemuDriver(true); disk.setDiscard(DiscardType.UNMAP); @@ -3426,6 +3433,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv if (cacheMode != null) { diskdef.setCacheMode(DiskDef.DiskCacheMode.valueOf(cacheMode.toUpperCase())); } + + diskdef.setPhysicalBlockIOSize(attachingPool.getSupportedPhysicalBlockSize()); + diskdef.setLogicalBlockIOSize(attachingPool.getSupportedLogicalBlockSize()); } final String xml = diskdef.toString(); 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 b739c0ee0ab..cbef2612919 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 @@ -699,6 +699,18 @@ public class LibvirtVMDef { } + public enum BlockIOSize { + SIZE_512("512"), SIZE_4K("4096"); + final String blockSize; + + BlockIOSize(String size) { this.blockSize = size; } + + @Override + public String toString() { + return blockSize; + } + } + private DeviceType _deviceType; /* floppy, disk, cdrom */ private DiskType _diskType; private DiskProtocol _diskProtocol; @@ -732,6 +744,8 @@ public class LibvirtVMDef { private IoDriverPolicy ioDriver; private LibvirtDiskEncryptDetails encryptDetails; private boolean isIothreadsEnabled; + private BlockIOSize logicalBlockIOSize = null; + private BlockIOSize physicalBlockIOSize = null; public DiscardType getDiscard() { return _discard; @@ -757,6 +771,10 @@ public class LibvirtVMDef { this.isIothreadsEnabled = isIothreadsEnabled; } + public void setPhysicalBlockIOSize(BlockIOSize size) { this.physicalBlockIOSize = size; } + + public void setLogicalBlockIOSize(BlockIOSize size) { this.logicalBlockIOSize = size; } + public void defFileBasedDisk(String filePath, String diskLabel, DiskBus bus, DiskFmtType diskFmtType) { _diskType = DiskType.FILE; _deviceType = DeviceType.DISK; @@ -1143,6 +1161,17 @@ public class LibvirtVMDef { } diskBuilder.append("/>\n"); + if (logicalBlockIOSize != null || physicalBlockIOSize != null) { + diskBuilder.append("\n"); + } + if (_serial != null && !_serial.isEmpty() && _deviceType != DeviceType.LUN) { diskBuilder.append("" + _serial + "\n"); } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java index 3bff9c9852e..e422c7da1f9 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java @@ -19,6 +19,7 @@ package com.cloud.hypervisor.kvm.storage; import java.util.List; import java.util.Map; +import com.cloud.hypervisor.kvm.resource.LibvirtVMDef; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import com.cloud.storage.Storage; @@ -74,4 +75,12 @@ public interface KVMStoragePool { public boolean supportsConfigDriveIso(); public Map getDetails(); + + default LibvirtVMDef.DiskDef.BlockIOSize getSupportedLogicalBlockSize() { + return null; + } + + default LibvirtVMDef.DiskDef.BlockIOSize getSupportedPhysicalBlockSize() { + return null; + } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 392863cf32f..627c0178edb 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -1462,6 +1462,8 @@ public class KVMStorageProcessor implements StorageProcessor { if (ioDriver != null) { resource.setDiskIoDriver(diskdef, resource.getIoDriverForTheStorage(ioDriver.toUpperCase())); } + diskdef.setPhysicalBlockIOSize(attachingPool.getSupportedPhysicalBlockSize()); + diskdef.setLogicalBlockIOSize(attachingPool.getSupportedLogicalBlockSize()); } attachOrDetachDevice(conn, attach, vmName, diskdef, waitDetachDevice); diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java index 741f0a8c23d..d34335cb11d 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java @@ -239,6 +239,43 @@ public class LibvirtVMDefTest extends TestCase { assertEquals(expectedXML, disk.toString()); } + @Test + public void testDiskDefWithBlockIO() { + String filePath = "/var/lib/libvirt/images/disk.qcow2"; + String diskLabel = "vda"; + + DiskDef disk = new DiskDef(); + DiskDef.DiskBus bus = DiskDef.DiskBus.VIRTIO; + DiskDef.DiskFmtType type = DiskDef.DiskFmtType.QCOW2; + DiskDef.DiskCacheMode cacheMode = DiskDef.DiskCacheMode.WRITEBACK; + + disk.defFileBasedDisk(filePath, diskLabel, bus, type); + disk.setCacheMode(cacheMode); + disk.setLogicalBlockIOSize(DiskDef.BlockIOSize.SIZE_4K); + + assertEquals(filePath, disk.getDiskPath()); + assertEquals(diskLabel, disk.getDiskLabel()); + assertEquals(bus, disk.getBusType()); + assertEquals(DiskDef.DeviceType.DISK, disk.getDeviceType()); + + String expectedXmlLogical = "\n\n" + + "\n\n\n\n"; + + assertEquals(expectedXmlLogical, disk.toString()); + + String expectedXmlPhysical = "\n\n" + + "\n\n\n\n"; + + disk.setLogicalBlockIOSize(null); + disk.setPhysicalBlockIOSize(DiskDef.BlockIOSize.SIZE_4K); + assertEquals(expectedXmlPhysical, disk.toString()); + + disk.setLogicalBlockIOSize(DiskDef.BlockIOSize.SIZE_512); + String expectedXml = "\n\n" + + "\n\n\n\n"; + assertEquals(expectedXml, disk.toString()); + } + @Test public void testDiskDefWithMultipleHosts() { String path = "/mnt/primary1";