Skip to content

Support KVM storage implementations controlling logical/physical block io size #8724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Mar 15, 2024
Merged

Support KVM storage implementations controlling logical/physical block io size #8724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
924f33c
Support KVM storage implementations controlling logical/physical bloc…
Feb 28, 2024
229bb47
Support custom block size during disk attach
Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3058,6 +3058,13 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
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);
Expand Down Expand Up @@ -3486,6 +3493,9 @@ public synchronized String attachOrDetachDisk(final Connect conn,
if (cacheMode != null) {
diskdef.setCacheMode(DiskDef.DiskCacheMode.valueOf(cacheMode.toUpperCase()));
}

diskdef.setPhysicalBlockIOSize(attachingPool.getSupportedPhysicalBlockSize());
diskdef.setLogicalBlockIOSize(attachingPool.getSupportedLogicalBlockSize());
}

final String xml = diskdef.toString();
Expand Down
29 changes: 29 additions & 0 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,18 @@ public String toString() {

}

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;
Expand Down Expand Up @@ -733,6 +745,8 @@ public String toString() {
private IoDriverPolicy ioDriver;
private LibvirtDiskEncryptDetails encryptDetails;
private boolean isIothreadsEnabled;
private BlockIOSize logicalBlockIOSize = null;
private BlockIOSize physicalBlockIOSize = null;

public DiscardType getDiscard() {
return _discard;
Expand All @@ -758,6 +772,10 @@ public void isIothreadsEnabled(boolean isIothreadsEnabled) {
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;
Expand Down Expand Up @@ -1156,6 +1174,17 @@ public String toString() {
}
diskBuilder.append("/>\n");

if (logicalBlockIOSize != null || physicalBlockIOSize != null) {
diskBuilder.append("<blockio ");
if (logicalBlockIOSize != null) {
diskBuilder.append(String.format("logical_block_size='%s' ", logicalBlockIOSize));
}
if (physicalBlockIOSize != null) {
diskBuilder.append(String.format("physical_block_size='%s' ", physicalBlockIOSize));
}
diskBuilder.append("/>\n");
}

if (_serial != null && !_serial.isEmpty() && _deviceType != DeviceType.LUN) {
diskBuilder.append("<serial>" + _serial + "</serial>\n");
}
Expand Down
9 changes: 9 additions & 0 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import com.cloud.agent.properties.AgentProperties;
import com.cloud.agent.properties.AgentPropertiesFileHandler;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
import org.joda.time.Duration;

Expand Down Expand Up @@ -99,4 +100,12 @@ public interface KVMStoragePool {
public Boolean checkingHeartBeat(HAStoragePool pool, HostTO host);

public Boolean vmActivityCheck(HAStoragePool pool, HostTO host, Duration activityScriptTimeout, String volumeUUIDListString, String vmActivityCheckPath, long duration);

default LibvirtVMDef.DiskDef.BlockIOSize getSupportedLogicalBlockSize() {
return null;
}

default LibvirtVMDef.DiskDef.BlockIOSize getSupportedPhysicalBlockSize() {
return null;
}
}
2 changes: 2 additions & 0 deletions ...s/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,6 +1482,8 @@ protected synchronized void attachOrDetachDisk(final Connect conn, final boolean
if (ioDriver != null) {
resource.setDiskIoDriver(diskdef, resource.getIoDriverForTheStorage(ioDriver.toUpperCase()));
}
diskdef.setPhysicalBlockIOSize(attachingPool.getSupportedPhysicalBlockSize());
diskdef.setLogicalBlockIOSize(attachingPool.getSupportedLogicalBlockSize());
}

attachOrDetachDevice(conn, attach, vmName, diskdef, waitDetachDevice);
Expand Down
37 changes: 37 additions & 0 deletions ...ins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,43 @@ public void testDiskDefWithEncryption() {
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 = "<disk device='disk' type='file'>\n<driver name='qemu' type='" + type.toString() + "' cache='" + cacheMode.toString() + "' />\n" +
"<source file='" + filePath + "'/>\n<target dev='" + diskLabel + "' bus='" + bus.toString() + "'/>\n<blockio logical_block_size='4096' />\n</disk>\n";

assertEquals(expectedXmlLogical, disk.toString());

String expectedXmlPhysical = "<disk device='disk' type='file'>\n<driver name='qemu' type='" + type.toString() + "' cache='" + cacheMode.toString() + "' />\n" +
"<source file='" + filePath + "'/>\n<target dev='" + diskLabel + "' bus='" + bus.toString() + "'/>\n<blockio physical_block_size='4096' />\n</disk>\n";

disk.setLogicalBlockIOSize(null);
disk.setPhysicalBlockIOSize(DiskDef.BlockIOSize.SIZE_4K);
assertEquals(expectedXmlPhysical, disk.toString());

disk.setLogicalBlockIOSize(DiskDef.BlockIOSize.SIZE_512);
String expectedXml = "<disk device='disk' type='file'>\n<driver name='qemu' type='" + type.toString() + "' cache='" + cacheMode.toString() + "' />\n" +
"<source file='" + filePath + "'/>\n<target dev='" + diskLabel + "' bus='" + bus.toString() + "'/>\n<blockio logical_block_size='512' physical_block_size='4096' />\n</disk>\n";
assertEquals(expectedXml, disk.toString());
}

@Test
public void testDiskDefWithMultipleHosts() {
String path = "/mnt/primary1";
Expand Down