Skip to content

kvm: resolve RBD disks of unmanaged instances without a mount lookup #14693

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
weizhouapache wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+83 −10
Open

kvm: resolve RBD disks of unmanaged instances without a mount lookup #14693

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
32 changes: 22 additions & 10 deletions ...com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private List<UnmanagedInstanceTO.Nic> getUnmanagedInstanceNics(LibvirtComputingR
return nics;
}

private List<UnmanagedInstanceTO.Disk> getUnmanagedInstanceDisks(List<LibvirtVMDef.DiskDef> disksInfo, LibvirtComputingResource libvirtComputingResource, Connect conn, String domainName) {
protected List<UnmanagedInstanceTO.Disk> getUnmanagedInstanceDisks(List<LibvirtVMDef.DiskDef> disksInfo, LibvirtComputingResource libvirtComputingResource, Connect conn, String domainName) {
final ArrayList<UnmanagedInstanceTO.Disk> disks = new ArrayList<>(disksInfo.size());
int counter = 0;
for (LibvirtVMDef.DiskDef diskDef : disksInfo) {
Expand All @@ -215,18 +215,30 @@ private List<UnmanagedInstanceTO.Disk> getUnmanagedInstanceDisks(List<LibvirtVMD
disk.setLabel(diskDef.getDiskLabel());
disk.setController(diskDef.getBusType().toString());

Pair<String, String> sourceHostPath = getSourceHostPath(libvirtComputingResource, diskDef.getSourcePath());
if (sourceHostPath != null) {
disk.setDatastoreHost(sourceHostPath.first());
disk.setDatastorePath(sourceHostPath.second());
if (diskDef.getDiskType() == LibvirtVMDef.DiskDef.DiskType.NETWORK
&& diskDef.getDiskProtocol() == LibvirtVMDef.DiskDef.DiskProtocol.RBD) {
// RBD disks are not backed by a mounted filesystem, so a mount lookup would match an
// unrelated mount. Use the monitor host and the pool name from the source. Other network
// disks (Gluster) keep the mount lookup, as their pool path is the mounted volume.
String sourcePath = diskDef.getSourcePath();
int poolEnd = sourcePath.indexOf("/");
String poolName = poolEnd > 0 ? sourcePath.substring(0, poolEnd) : sourcePath;
disk.setDatastoreHost(diskDef.getSourceHost());
disk.setDatastorePath(poolName);
} else {
int pathEnd = diskDef.getSourcePath().lastIndexOf("/");
if (pathEnd >= 0) {
disk.setDatastorePath(diskDef.getSourcePath().substring(0, pathEnd));
Pair<String, String> sourceHostPath = getSourceHostPath(libvirtComputingResource, diskDef.getSourcePath());
if (sourceHostPath != null) {
disk.setDatastoreHost(sourceHostPath.first());
disk.setDatastorePath(sourceHostPath.second());
} else {
disk.setDatastorePath(diskDef.getSourcePath());
int pathEnd = diskDef.getSourcePath().lastIndexOf("/");
if (pathEnd >= 0) {
disk.setDatastorePath(diskDef.getSourcePath().substring(0, pathEnd));
} else {
disk.setDatastorePath(diskDef.getSourcePath());
}
disk.setDatastoreHost(diskDef.getSourceHost());
}
disk.setDatastoreHost(diskDef.getSourceHost());
}

disk.setDatastoreType(diskDef.getDiskType().toString());
Expand Down
61 changes: 61 additions & 0 deletions ...cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,21 @@
// under the License.
package com.cloud.hypervisor.kvm.resource.wrapper;

import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
import com.cloud.utils.Pair;
import org.apache.cloudstack.vm.UnmanagedInstanceTO;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.libvirt.Connect;
import org.libvirt.Domain;
import org.libvirt.DomainBlockInfo;
import org.mockito.Mockito;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnitRunner;

import java.util.List;
import java.util.UUID;

@RunWith(MockitoJUnitRunner.class)
Expand Down Expand Up @@ -70,4 +77,58 @@ public void testGetDiskRelativePathFullPath() {
Mockito.when(diskDef.getSourcePath()).thenReturn(imagePath);
Assert.assertEquals(relativePath, wrapper.getDiskRelativePath(diskDef));
}

@Test
public void testGlusterDiskStillUsesMountLookup() throws Exception {
LibvirtComputingResource libvirtComputingResource = Mockito.mock(LibvirtComputingResource.class);
Connect conn = Mockito.mock(Connect.class);
Domain domain = Mockito.mock(Domain.class);
String domainName = "i-2-40-VM";
Mockito.when(conn.domainLookupByName(domainName)).thenReturn(domain);
Mockito.when(domain.blockInfo(Mockito.anyString())).thenReturn(Mockito.mock(DomainBlockInfo.class));
Mockito.when(libvirtComputingResource.getSourceHostPath("vol1"))
.thenReturn(new Pair<>("10.0.0.5", "/vol1"));

LibvirtVMDef.DiskDef glusterDisk = new LibvirtVMDef.DiskDef();
glusterDisk.defNetworkBasedDisk("vol1/img.qcow2", "10.0.0.5", 24007, null, null, 0,
LibvirtVMDef.DiskDef.DiskBus.VIRTIO, LibvirtVMDef.DiskDef.DiskProtocol.GLUSTER,
LibvirtVMDef.DiskDef.DiskFmtType.QCOW2);

List<UnmanagedInstanceTO.Disk> disks = wrapper.getUnmanagedInstanceDisks(List.of(glusterDisk),
libvirtComputingResource, conn, domainName);

Assert.assertEquals(1, disks.size());
Assert.assertEquals("10.0.0.5", disks.get(0).getDatastoreHost());
Assert.assertEquals("/vol1", disks.get(0).getDatastorePath());
Mockito.verify(libvirtComputingResource).getSourceHostPath("vol1");
}

@Test
public void testRbdDiskIsNotResolvedThroughMountLookup() throws Exception {
LibvirtComputingResource libvirtComputingResource = Mockito.mock(LibvirtComputingResource.class);
Connect conn = Mockito.mock(Connect.class);
Domain domain = Mockito.mock(Domain.class);
String domainName = "i-2-35-VM";
Mockito.when(conn.domainLookupByName(domainName)).thenReturn(domain);
Mockito.when(domain.blockInfo(Mockito.anyString())).thenReturn(Mockito.mock(DomainBlockInfo.class));

LibvirtVMDef.DiskDef rbdDisk = new LibvirtVMDef.DiskDef();
String imageName = "230e1224-f7b7-4dfc-97a7-3a0752636a31";
rbdDisk.defNetworkBasedDisk("cloudstack/" + imageName, "192.168.55.201", 6789, null, null, 0,
LibvirtVMDef.DiskDef.DiskBus.VIRTIO, LibvirtVMDef.DiskDef.DiskProtocol.RBD,
LibvirtVMDef.DiskDef.DiskFmtType.RAW);

List<UnmanagedInstanceTO.Disk> disks = wrapper.getUnmanagedInstanceDisks(List.of(rbdDisk),
libvirtComputingResource, conn, domainName);

Assert.assertEquals(1, disks.size());
UnmanagedInstanceTO.Disk disk = disks.get(0);
Assert.assertEquals("192.168.55.201", disk.getDatastoreHost());
Assert.assertEquals("cloudstack", disk.getDatastorePath());
Assert.assertEquals("cloudstack", disk.getDatastoreName());
Assert.assertEquals("network", disk.getDatastoreType());
Assert.assertEquals("cloudstack/" + imageName, disk.getImagePath());
Assert.assertEquals(imageName, disk.getFileBaseName());
Mockito.verify(libvirtComputingResource, Mockito.never()).getSourceHostPath(Mockito.anyString());
}
}
Loading