Skip to content

kvm: enable discard on the virtio bus #14618

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

Open
Kukunin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

kvm: enable discard on the virtio bus #14618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 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 @@ -3858,7 +3858,7 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
disk.setLogicalBlockIOSize(pool.getSupportedLogicalBlockSize());
disk.setPhysicalBlockIOSize(pool.getSupportedPhysicalBlockSize());

if (diskBusType == DiskDef.DiskBus.SCSI || diskBusType == DiskDef.DiskBus.VIRTIOBLK) {
if (diskBusSupportsDiscard(diskBusType)) {
disk.setQemuDriver(true);
disk.setDiscard(DiscardType.UNMAP);
}
Expand Down Expand Up @@ -4073,6 +4073,10 @@ public boolean isQemuDiscardBugFree(DiskDef.DiskBus diskBus) {
return diskBus != DiskDef.DiskBus.IDE || getHypervisorQemuVersion() >= HYPERVISOR_QEMU_VERSION_IDE_DISCARD_FIXED;
}

protected boolean diskBusSupportsDiscard(DiskDef.DiskBus diskBus) {
return diskBus == DiskDef.DiskBus.SCSI || diskBus == DiskDef.DiskBus.VIRTIO || diskBus == DiskDef.DiskBus.VIRTIOBLK;
}

public boolean isUbuntuOrDebianHost() {
Map<String, String> versionString = getVersionStrings();
String hostKey = "Host.OS";
Expand Down Expand Up @@ -4266,7 +4270,7 @@ public synchronized String attachOrDetachDisk(final Connect conn,
}

diskdef = new DiskDef();
if (busT == DiskDef.DiskBus.SCSI) {
if (diskBusSupportsDiscard(busT)) {
diskdef.setQemuDriver(true);
diskdef.setDiscard(DiscardType.UNMAP);
}
Expand Down
99 changes: 69 additions & 30 deletions ...ors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6555,60 +6555,56 @@ public void calculateVmMetricsTestOldStatsIsNotNullCalculatesUtilization() throw
Assert.assertEquals(newStats.getDiskWriteKBs() - oldStats.getDiskWriteKBs(), metrics.getDiskWriteKBs(), 0);
}

@Test
public void createLinstorVdb() throws LibvirtException, InternalErrorException, URISyntaxException {
final Connect connect = Mockito.mock(Connect.class);

final int id = random.nextInt(65534);
final String name = "test-instance-1";

private VirtualMachineTO prepareVmForCreateVbd(StoragePoolType poolType, PhysicalDiskFormat diskFormat, String volumePath) {
final int cpus = 2;
final int speed = 1024;
final int minRam = 256 * 1024;
final int maxRam = 512 * 1024;
final String os = "Ubuntu";
final String vncPassword = "mySuperSecretPassword";

final VirtualMachineTO to = new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, speed, minRam,
maxRam, BootloaderType.HVM, os, false, false, vncPassword);
final VirtualMachineTO to = new VirtualMachineTO(random.nextInt(65534), "test-instance-1", VirtualMachine.Type.User,
cpus, 1024, 256 * 1024, 512 * 1024, BootloaderType.HVM, "Ubuntu", false, false, "mySuperSecretPassword");
to.setVncAddr("");
to.setArch("x86_64");
to.setUuid("b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9");
to.setVcpuMaxLimit(cpus + 1);
final HashMap<String, String> vmToDetails = new HashMap<>();
to.setDetails(vmToDetails);
to.setDetails(new HashMap<>());

String diskLinPath = "9ebe53c1-3d35-46e5-b7aa-6fc223ba0fcf";
final String diskPath = "9ebe53c1-3d35-46e5-b7aa-6fc223ba0fcf";
final DiskTO diskTO = new DiskTO();
diskTO.setDiskSeq(1L);
diskTO.setType(Volume.Type.ROOT);
diskTO.setDetails(new HashMap<>());
diskTO.setPath(diskLinPath);
diskTO.setPath(diskPath);

final String poolUuid = "9ebe53c1-3d35-46e5-b7aa-6fc223ac4fcf";
final PrimaryDataStoreTO primaryDataStoreTO = Mockito.mock(PrimaryDataStoreTO.class);
String pDSTOUUID = "9ebe53c1-3d35-46e5-b7aa-6fc223ac4fcf";
when(primaryDataStoreTO.getPoolType()).thenReturn(StoragePoolType.Linstor);
when(primaryDataStoreTO.getUuid()).thenReturn(pDSTOUUID);

VolumeObjectTO dataTO = new VolumeObjectTO();
when(primaryDataStoreTO.getPoolType()).thenReturn(poolType);
when(primaryDataStoreTO.getUuid()).thenReturn(poolUuid);

final VolumeObjectTO dataTO = new VolumeObjectTO();
dataTO.setUuid("12be53c1-3d35-46e5-b7aa-6fc223ba0f34");
dataTO.setPath(diskTO.getPath());
dataTO.setPath(diskPath);
dataTO.setDataStore(primaryDataStoreTO);
diskTO.setData(dataTO);
to.setDisks(new DiskTO[]{diskTO});

String path = "/dev/drbd1020";
final KVMStoragePoolManager storagePoolMgr = Mockito.mock(KVMStoragePoolManager.class);
final KVMStoragePool storagePool = Mockito.mock(KVMStoragePool.class);
final KVMPhysicalDisk vol = Mockito.mock(KVMPhysicalDisk.class);

when(libvirtComputingResourceSpy.getStoragePoolMgr()).thenReturn(storagePoolMgr);
when(storagePool.getType()).thenReturn(StoragePoolType.Linstor);
when(storagePoolMgr.getPhysicalDisk(StoragePoolType.Linstor, pDSTOUUID, diskLinPath)).thenReturn(vol);
when(vol.getPath()).thenReturn(path);
when(storagePool.getType()).thenReturn(poolType);
when(storagePoolMgr.getPhysicalDisk(poolType, poolUuid, diskPath)).thenReturn(vol);
when(vol.getPath()).thenReturn(volumePath);
when(vol.getPool()).thenReturn(storagePool);
when(vol.getFormat()).thenReturn(PhysicalDiskFormat.RAW);
when(vol.getFormat()).thenReturn(diskFormat);

return to;
}

@Test
public void createLinstorVdb() throws LibvirtException, InternalErrorException, URISyntaxException {
final Connect connect = Mockito.mock(Connect.class);

final VirtualMachineTO to = prepareVmForCreateVbd(StoragePoolType.Linstor, PhysicalDiskFormat.RAW, "/dev/drbd1020");
final String name = to.getName();
final Map<String, String> vmToDetails = to.getDetails();

// 1. test Bus: IDE and broken qemu version -> NO discard
when(libvirtComputingResourceSpy.getHypervisorQemuVersion()).thenReturn(6000000L);
Expand Down Expand Up @@ -6665,6 +6661,49 @@ public void createLinstorVdb() throws LibvirtException, InternalErrorException,
}
}

@Test
public void createNfsVbdDiscard() throws LibvirtException, InternalErrorException, URISyntaxException {
final Connect connect = Mockito.mock(Connect.class);

final VirtualMachineTO to = prepareVmForCreateVbd(StoragePoolType.NetworkFilesystem, PhysicalDiskFormat.QCOW2,
"/mnt/02e0e152-5462-31a9-b8c6-35e3760dc6b4/9ebe53c1-3d35-46e5-b7aa-6fc223ba0fcf");
final String name = to.getName();
final Map<String, String> vmToDetails = to.getDetails();
Mockito.doNothing().when(libvirtComputingResourceSpy).setBackingFileFormat(Mockito.anyString());

vmToDetails.put(VmDetailConstants.ROOT_DISK_CONTROLLER, DiskDef.DiskBus.VIRTIO.name());
{
LibvirtVMDef vm = new LibvirtVMDef();
vm.addComp(new DevicesDef());
libvirtComputingResourceSpy.createVbd(connect, to, name, vm);

DiskDef rootDisk = vm.getDevices().getDisks().get(0);
assertEquals(DiskDef.DiskBus.VIRTIO, rootDisk.getBusType());
assertEquals(DiskDef.DiscardType.UNMAP, rootDisk.getDiscard());
}

vmToDetails.put(VmDetailConstants.ROOT_DISK_CONTROLLER, DiskDef.DiskBus.IDE.name());
{
LibvirtVMDef vm = new LibvirtVMDef();
vm.addComp(new DevicesDef());
libvirtComputingResourceSpy.createVbd(connect, to, name, vm);

DiskDef rootDisk = vm.getDevices().getDisks().get(0);
assertEquals(DiskDef.DiskBus.IDE, rootDisk.getBusType());
assertEquals(DiskDef.DiscardType.IGNORE, rootDisk.getDiscard());
}
}

@Test
public void testDiskBusSupportsDiscard() {
assertTrue(libvirtComputingResourceSpy.diskBusSupportsDiscard(DiskDef.DiskBus.SCSI));
assertTrue(libvirtComputingResourceSpy.diskBusSupportsDiscard(DiskDef.DiskBus.VIRTIO));
assertTrue(libvirtComputingResourceSpy.diskBusSupportsDiscard(DiskDef.DiskBus.VIRTIOBLK));
assertFalse(libvirtComputingResourceSpy.diskBusSupportsDiscard(DiskDef.DiskBus.IDE));
assertFalse(libvirtComputingResourceSpy.diskBusSupportsDiscard(DiskDef.DiskBus.SATA));
}


@Test
public void testGetDiskModelFromVMDetailVirtioBlk() {
VirtualMachineTO virtualMachineTO = Mockito.mock(VirtualMachineTO.class);
Expand Down