Skip to content

server: fix volume detach operation when no vm host #7526

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
DaanHoogland merged 3 commits into from
May 25, 2023
Merged

server: fix volume detach operation when no vm host #7526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
877edf5
server: fix volume detach operation when no vm host
shwstppr May 12, 2023
7b9dd82
wip
shwstppr May 12, 2023
d4f7f2a
tests
shwstppr May 12, 2023
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
68 changes: 26 additions & 42 deletions server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@

import javax.inject.Inject;

import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
import org.apache.cloudstack.api.ApiConstants.IoDriverPolicy;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.ApiConstants.IoDriverPolicy;
import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.ChangeOfferingForVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
Expand Down Expand Up @@ -104,8 +102,8 @@
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -148,6 +146,8 @@
import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
import com.cloud.offering.DiskOffering;
import com.cloud.org.Grouping;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.resource.ResourceState;
import com.cloud.serializer.GsonHelper;
import com.cloud.server.ManagementService;
Expand Down Expand Up @@ -2778,31 +2778,10 @@ private Volume orchestrateDetachVolumeFromVM(long vmId, long volumeId) {
String errorMsg = "Failed to detach volume " + volume.getName() + " from VM " + vm.getHostName();
boolean sendCommand = vm.getState() == State.Running;

Long hostId = vm.getHostId();

if (hostId == null) {
hostId = vm.getLastHostId();
HostVO host = _hostDao.findById(hostId);

if (host != null && host.getHypervisorType() == HypervisorType.VMware) {
sendCommand = true;
}
}

HostVO host = null;
StoragePoolVO volumePool = _storagePoolDao.findByIdIncludingRemoved(volume.getPoolId());

if (hostId != null) {
host = _hostDao.findById(hostId);

if (host != null && host.getHypervisorType() == HypervisorType.XenServer && volumePool != null && volumePool.isManaged()) {
sendCommand = true;
}
}

if (volumePool == null) {
sendCommand = false;
}
HostVO host = getHostForVmVolumeAttachDetach(vm, volumePool);
Long hostId = host != null ? host.getId() : null;
sendCommand = sendCommand || isSendCommandForVmVolumeAttachDetach(host, volumePool);

Answer answer = null;

Expand Down Expand Up @@ -4080,15 +4059,15 @@ private String getNameOfClusteredFileSystem(HostVO hostVO) {
return "clustered file systems";
}

private HostVO getHostForVmVolumeAttach(UserVmVO vm, StoragePoolVO volumeToAttachStoragePool) {
private HostVO getHostForVmVolumeAttachDetach(VirtualMachine vm, StoragePoolVO volumeStoragePool) {
HostVO host = null;
Pair<Long, Long> clusterAndHostId = virtualMachineManager.findClusterAndHostIdForVm(vm.getId());
Long hostId = clusterAndHostId.second();
Long clusterId = clusterAndHostId.first();
if (hostId == null && clusterId != null &&
State.Stopped.equals(vm.getState()) &&
volumeToAttachStoragePool != null &&
!ScopeType.HOST.equals(volumeToAttachStoragePool.getScope())) {
volumeStoragePool != null &&
!ScopeType.HOST.equals(volumeStoragePool.getScope())) {
List<HostVO> hosts = _hostDao.findHypervisorHostInCluster(clusterId);
if (!hosts.isEmpty()) {
host = hosts.get(0);
Expand All @@ -4100,6 +4079,18 @@ private HostVO getHostForVmVolumeAttach(UserVmVO vm, StoragePoolVO volumeToAttac
return host;
}

protected boolean isSendCommandForVmVolumeAttachDetach(HostVO host, StoragePoolVO volumeStoragePool) {
if (host == null || volumeStoragePool == null) {
return false;
}
boolean sendCommand = HypervisorType.VMware.equals(host.getHypervisorType());
if (HypervisorType.XenServer.equals(host.getHypervisorType()) &&
volumeStoragePool.isManaged()) {
sendCommand = true;
}
return sendCommand;
}

private VolumeVO sendAttachVolumeCommand(UserVmVO vm, VolumeVO volumeToAttach, Long deviceId) {
String errorMsg = "Failed to attach volume " + volumeToAttach.getName() + " to VM " + vm.getHostName();
boolean sendCommand = vm.getState() == State.Running;
Expand All @@ -4108,16 +4099,9 @@ private VolumeVO sendAttachVolumeCommand(UserVmVO vm, VolumeVO volumeToAttach, L
if (s_logger.isTraceEnabled() && volumeToAttachStoragePool != null) {
s_logger.trace(String.format("storage is gotten from volume to attach: %s/%s",volumeToAttachStoragePool.getName(),volumeToAttachStoragePool.getUuid()));
}
HostVO host = getHostForVmVolumeAttach(vm, volumeToAttachStoragePool);
Long hostId = host == null ? null : host.getId();
if (host != null && host.getHypervisorType() == HypervisorType.VMware) {
sendCommand = true;
}

if (host != null && host.getHypervisorType() == HypervisorType.XenServer &&
volumeToAttachStoragePool != null && volumeToAttachStoragePool.isManaged()) {
sendCommand = true;
}
HostVO host = getHostForVmVolumeAttachDetach(vm, volumeToAttachStoragePool);
Long hostId = host != null ? host.getId() : null;
sendCommand = sendCommand || isSendCommandForVmVolumeAttachDetach(host, volumeToAttachStoragePool);

if (host != null) {
_hostDao.loadDetails(host);
Expand Down
54 changes: 46 additions & 8 deletions server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
package com.cloud.storage;

import static org.junit.Assert.assertEquals;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.storage.dao.SnapshotDao;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
Expand All @@ -40,10 +36,6 @@
import java.util.UUID;
import java.util.concurrent.ExecutionException;

import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
Expand Down Expand Up @@ -90,16 +82,25 @@
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Grouping;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.serializer.GsonHelper;
import com.cloud.server.TaggedResourceService;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.Storage.ProvisioningType;
import com.cloud.storage.Volume.Type;
import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.StoragePoolTagsDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
Expand Down Expand Up @@ -1525,4 +1526,41 @@ public void testGetMinimumHypervisorVersionInDatacenterVersions() {
String expected = "6.7";
testBaseListOrderedHostsHypervisorVersionInDc(hwVersions, hypervisorType, expected);
}

@Test
public void testIsSendCommandForVmVolumeAttachDetachNullValues() {
Assert.assertFalse(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(null, null));
Assert.assertFalse(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(null, Mockito.mock(StoragePoolVO.class)));
Assert.assertFalse(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(Mockito.mock(HostVO.class), null));
}

@Test
public void testIsSendCommandForVmVolumeAttachDetachVMwareHost() {
HostVO host = Mockito.mock(HostVO.class);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.VMware);
Assert.assertTrue(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(host, Mockito.mock(StoragePoolVO.class)));
}

@Test
public void testIsSendCommandForVmVolumeAttachDetachXenserverHostNonMananged() {
HostVO host = Mockito.mock(HostVO.class);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.XenServer);
Assert.assertFalse(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(host, Mockito.mock(StoragePoolVO.class)));
}

@Test
public void testIsSendCommandForVmVolumeAttachDetachXenserverHostMananged() {
HostVO host = Mockito.mock(HostVO.class);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.XenServer);
StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
Mockito.when(pool.isManaged()).thenReturn(true);
Assert.assertTrue(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(host, pool));
}

@Test
public void testIsSendCommandForVmVolumeAttachDetachKVMHost() {
HostVO host = Mockito.mock(HostVO.class);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
Assert.assertFalse(volumeApiServiceImpl.isSendCommandForVmVolumeAttachDetach(host, Mockito.mock(StoragePoolVO.class)));
}
}