etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge forward error

This commit is contained in:
Daan Hoogland 2026-01-26 14:17:38 +01:00
parent edb62b490c
commit d50899427a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View File

@ -2366,7 +2366,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
List<Long> conflictingHostIds = new ArrayList<>(CollectionUtils.intersection(hostIdsToDisconnect, hostIdsUsingTheStoragePool));
if (CollectionUtils.isNotEmpty(conflictingHostIds)) {
Map<HostVO, List<VolumeVO>> hostVolumeMap = new HashMap<>();
List<VolumeVO> volumesInPool = volumeDao.findByPoolId(poolId);
List<VolumeVO> volumesInPool = volumeDao.findNonDestroyedVolumesByPoolId(poolId);
Map<Long, VMInstanceVO> vmInstanceCache = new HashMap<>();
for (Long hostId : conflictingHostIds) {

2
server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
View File

@ -944,7 +944,7 @@ public class ResourceManagerImplTest {
Mockito.when(volume2.getInstanceId()).thenReturn(101L);
List<VolumeVO> volumesInPool = Arrays.asList(volume1, volume2);
Mockito.doReturn(volumesInPool).when(volumeDao).findByPoolId(poolId);
Mockito.doReturn(volumesInPool).when(volumeDao).findNonDestroyedVolumesByPoolId(poolId);
VMInstanceVO vmInstance1 = Mockito.mock(VMInstanceVO.class);
VMInstanceVO vmInstance2 = Mockito.mock(VMInstanceVO.class);