Skip to content

Clear pool id if volume allocation fails #8202

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
harikrishna-patnala merged 3 commits into from
Nov 21, 2023
Merged

Clear pool id if volume allocation fails #8202

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
832b924
clear pool id if volume allocation fails and leave volume state as Al…
Nov 6, 2023
a8a930f
clear_pool_id_if_volume_allocation_fails
Nov 8, 2023
91896cd
Merge remote-tracking branch 'origin/4.18' into clear_pool_id_if_volu…
Nov 17, 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
10 changes: 10 additions & 0 deletions server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,16 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
for (VolumeVO toBeCreated : volumesTobeCreated) {
s_logger.debug("Checking suitable pools for volume (Id, Type): (" + toBeCreated.getId() + "," + toBeCreated.getVolumeType().name() + ")");

if (toBeCreated.getState() == Volume.State.Allocated && toBeCreated.getPoolId() != null) {
toBeCreated.setPoolId(null);
if (!_volsDao.update(toBeCreated.getId(), toBeCreated)) {
throw new CloudRuntimeException(String.format("Error updating volume [%s] to clear pool Id.", toBeCreated.getId()));
}
if (s_logger.isDebugEnabled()) {
String msg = String.format("Setting pool_id to NULL for volume id=%s as it is in Allocated state", toBeCreated.getId());
s_logger.debug(msg);
}
}
Comment on lines +1654 to +1663

@DaanHoogland DaanHoogland Nov 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be moved to a separate method and tested (separately)

// If the plan specifies a poolId, it means that this VM's ROOT
// volume is ready and the pool should be reused.
// In this case, also check if rest of the volumes are ready and can
Expand Down
103 changes: 103 additions & 0 deletions server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -33,26 +35,34 @@

import com.cloud.dc.ClusterDetailsVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.HostPodVO;
import com.cloud.gpu.GPU;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.Storage;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.Pair;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfileImpl;
import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.commons.collections.CollectionUtils;
import org.junit.Assert;
Expand All @@ -67,6 +77,7 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.powermock.api.mockito.PowerMockito;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScan.Filter;
Expand Down Expand Up @@ -197,6 +208,18 @@ public class DeploymentPlanningManagerImplTest {
@Mock
ConfigurationDao configDao;

@Mock
AccountManager _accountMgr;

@Inject
DiskOfferingDao _diskOfferingDao;

@Mock
DataStoreManager _dataStoreManager;

@Inject
HostPodDao _podDao;

private static final long dataCenterId = 1L;
private static final long instanceId = 123L;
private static final long hostId = 0L;
Expand Down Expand Up @@ -242,6 +265,8 @@ public void testSetUp() {
List<DeploymentPlanner> planners = new ArrayList<DeploymentPlanner>();
planners.add(_planner);
_dpm.setPlanners(planners);
StoragePoolAllocator allocator = Mockito.mock(StoragePoolAllocator.class);
_dpm.setStoragePoolAllocators(Arrays.asList(allocator));

Mockito.when(host.getId()).thenReturn(hostId);
Mockito.doNothing().when(_dpm).avoidDisabledResources(vmProfile, dc, avoids);
Expand Down Expand Up @@ -702,6 +727,84 @@ public void failEncRootPlannerHostSupportingEncryptionTest() {
}
}

@Test
public void findSuitablePoolsForVolumesTest() throws Exception {
Long diskOfferingId = 1L;
HostVO host = Mockito.spy(new HostVO("host"));
Map<String, String> hostDetails = new HashMap<>() {
{
put(Host.HOST_VOLUME_ENCRYPTION, "true");
}
};
host.setDetails(hostDetails);
Mockito.when(host.getStatus()).thenReturn(Status.Up);

VolumeVO vol1 = Mockito.spy(new VolumeVO("vol1", dataCenterId, podId, 1L, 1L, instanceId, "folder", "path",
Storage.ProvisioningType.THIN, (long) 10 << 30, Volume.Type.ROOT));
Mockito.when(vol1.getId()).thenReturn(1L);
vol1.setState(Volume.State.Allocated);
vol1.setPassphraseId(1L);
vol1.setPoolId(1L);
vol1.setDiskOfferingId(diskOfferingId);

StoragePoolVO storagePool = new StoragePoolVO();
storagePool.setStatus(StoragePoolStatus.Maintenance);
storagePool.setId(vol1.getPoolId());
storagePool.setDataCenterId(dataCenterId);
storagePool.setPodId(podId);
storagePool.setClusterId(clusterId);

DiskProfile diskProfile = Mockito.mock(DiskProfile.class);

StoragePoolAllocator allocator = Mockito.mock(StoragePoolAllocator.class);

DataCenterDeployment plan = new DataCenterDeployment(dataCenterId, podId, clusterId, null, null, null);

Account account = Mockito.mock(Account.class);
Mockito.when(account.getId()).thenReturn(1L);
Mockito.when(vmProfile.getOwner()).thenReturn(account);
Mockito.when(_accountMgr.isRootAdmin(account.getId())).thenReturn(Boolean.FALSE);

Mockito.when(_dcDao.findById(dataCenterId)).thenReturn(dc);
Mockito.when(dc.getAllocationState()).thenReturn(AllocationState.Enabled);

HostPodVO podVo = Mockito.mock(HostPodVO.class);
Mockito.when(podVo.getAllocationState()).thenReturn(AllocationState.Enabled);
Mockito.doReturn(podVo).when(_podDao).findById(podId);

ClusterVO cluster = Mockito.mock(ClusterVO.class);
Mockito.when(cluster.getAllocationState()).thenReturn(AllocationState.Enabled);
Mockito.when(_clusterDao.findById(clusterId)).thenReturn(cluster);

DiskOfferingVO diskOffering = Mockito.mock(DiskOfferingVO.class);

Mockito.when(_diskOfferingDao.findById(vol1.getDiskOfferingId())).thenReturn(diskOffering);
VirtualMachineTemplate vmt = Mockito.mock(VirtualMachineTemplate.class);

ServiceOfferingVO serviceOffering = Mockito.mock(ServiceOfferingVO.class);
Mockito.when(vmProfile.getServiceOffering()).thenReturn(serviceOffering);

PrimaryDataStore primaryDataStore = Mockito.mock(PrimaryDataStore.class);

Mockito.when(vmt.getFormat()).thenReturn(Storage.ImageFormat.ISO);
Mockito.when(vmProfile.getTemplate()).thenReturn(vmt);

Mockito.when(vmProfile.getId()).thenReturn(1L);
Mockito.when(vmProfile.getType()).thenReturn(VirtualMachine.Type.User);
Mockito.when(volDao.findUsableVolumesForInstance(1L)).thenReturn(Arrays.asList(vol1));
Mockito.when(volDao.findByInstanceAndType(1L, Volume.Type.ROOT)).thenReturn(Arrays.asList(vol1));
Mockito.when(_dataStoreManager.getPrimaryDataStore(vol1.getPoolId())).thenReturn((DataStore) primaryDataStore);
Mockito.when(avoids.shouldAvoid(storagePool)).thenReturn(Boolean.FALSE);
PowerMockito.whenNew(DiskProfile.class).withAnyArguments().thenReturn(diskProfile);

Mockito.doReturn(Arrays.asList(storagePool)).when(allocator).allocateToPool(diskProfile, vmProfile, plan,
avoids, 10);
Mockito.when(volDao.update(vol1.getId(), vol1)).thenReturn(true);
_dpm.findSuitablePoolsForVolumes(vmProfile, plan, avoids, 10);
verify(vol1, times(1)).setPoolId(null);
assertTrue(vol1.getPoolId() == null);

}
// This is so ugly but everything is so intertwined...
private DeploymentClusterPlanner setupMocksForPlanDeploymentHostTests(HostVO host, VolumeVO vol1) {
long diskOfferingId = 345L;
Expand Down
30 changes: 30 additions & 0 deletions server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -128,4 +130,32 @@ public void testIsVolumeSuspectedDestroyDuplicateTrue() {
Assert.assertTrue(storageManagerImpl.isVolumeSuspectedDestroyDuplicateOfVmVolume(volume));
}

@Test
public void storagePoolCompatibleWithVolumePoolTestVolumeWithPoolIdInAllocatedState() {
StoragePoolVO storagePool = new StoragePoolVO();
storagePool.setPoolType(Storage.StoragePoolType.PowerFlex);
storagePool.setId(1L);
VolumeVO volume = new VolumeVO();
volume.setState(Volume.State.Allocated);
volume.setPoolId(1L);
PrimaryDataStoreDao storagePoolDao = Mockito.mock(PrimaryDataStoreDao.class);
storageManagerImpl._storagePoolDao = storagePoolDao;
Mockito.doReturn(storagePool).when(storagePoolDao).findById(volume.getPoolId());
Assert.assertFalse(storageManagerImpl.storagePoolCompatibleWithVolumePool(storagePool, volume));

}

@Test
public void storagePoolCompatibleWithVolumePoolTestVolumeWithoutPoolIdInAllocatedState() {
StoragePoolVO storagePool = new StoragePoolVO();
storagePool.setPoolType(Storage.StoragePoolType.PowerFlex);
storagePool.setId(1L);
VolumeVO volume = new VolumeVO();
volume.setState(Volume.State.Allocated);
PrimaryDataStoreDao storagePoolDao = Mockito.mock(PrimaryDataStoreDao.class);
storageManagerImpl._storagePoolDao = storagePoolDao;
Assert.assertTrue(storageManagerImpl.storagePoolCompatibleWithVolumePool(storagePool, volume));

}

}