Skip to content

ConfigureStorageAccessCmd: Allow storage access configuration on empty clusters/pods/zones #13551

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

ConfigureStorageAccessCmd: Allow storage access configuration on empty clusters/pods/zones #13551

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
9 changes: 6 additions & 3 deletions server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2465,7 +2465,8 @@ protected void checkIfAllHostsInUse(List<String> sagsToDelete, Long clusterId, L
List<HostVO> hostsInZone = _hostDao.findByDataCenterId(zoneId);
Set<Long> hostIdsInUseSet = hostIdsUsingStorageAccessGroups.stream().collect(Collectors.toSet());

boolean allInUseZone = hostsInZone.stream()
// allMatch returns true on empty stream, need to check whether collection is not empty first
boolean allInUseZone = !hostsInZone.isEmpty() && hostsInZone.stream()
.map(HostVO::getId)
.allMatch(hostIdsInUseSet::contains);

Expand All @@ -2479,7 +2480,8 @@ protected void checkIfAllHostsInUse(List<String> sagsToDelete, Long clusterId, L
List<HostVO> hostsInCluster = _hostDao.findByClusterId(clusterId, Type.Routing);
Set<Long> hostIdsInUseSet = hostIdsUsingStorageAccessGroups.stream().collect(Collectors.toSet());

boolean allInUseCluster = hostsInCluster.stream()
// allMatch returns true on empty stream, need to check whether collection is not empty first
boolean allInUseCluster = !hostsInCluster.isEmpty() && hostsInCluster.stream()
.map(HostVO::getId)
.allMatch(hostIdsInUseSet::contains);

Expand All @@ -2493,7 +2495,8 @@ protected void checkIfAllHostsInUse(List<String> sagsToDelete, Long clusterId, L
List<HostVO> hostsInPod = _hostDao.findByPodId(podId, Type.Routing);
Set<Long> hostIdsInUseSet = hostIdsUsingStorageAccessGroups.stream().collect(Collectors.toSet());

boolean allInUsePod = hostsInPod.stream()
// allMatch returns true on empty stream, need to check whether collection is not empty first
boolean allInUsePod = !hostsInPod.isEmpty() && hostsInPod.stream()
.map(HostVO::getId)
.allMatch(hostIdsInUseSet::contains);

Expand Down
92 changes: 92 additions & 0 deletions server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,4 +1211,96 @@ public void executeUserRequestDefaultOverloadPassesFalseForDeleteHost() throws E

Mockito.verify(resourceManager).doDeleteHost(hostId, false, false);
}

@Test
public void testUpdateClusterStorageAccessGroupsWithEmptyHostsInCluster() {
Long clusterId = 1L;
List<String> newStorageAccessGroups = Arrays.asList("sag1", "sag2");

ClusterVO cluster = Mockito.mock(ClusterVO.class);
Mockito.when(cluster.getId()).thenReturn(clusterId);
Mockito.when(cluster.getStorageAccessGroups()).thenReturn("sag3,sag4"); // existing SAGs
Mockito.when(resourceManager.getCluster(clusterId)).thenReturn(cluster);
List<HostVO> emptyHostsList = new ArrayList<>();
Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(emptyHostsList);
Mockito.when(hostDao.findByClusterId(clusterId, Host.Type.Routing)).thenReturn(emptyHostsList);
List<Long> emptyHostIdsList = new ArrayList<>();
Mockito.doReturn(emptyHostIdsList).when(resourceManager)
.listOfHostIdsUsingTheStorageAccessGroups(Mockito.anyList(), eq(clusterId), eq(null), eq(null));
try {
resourceManager.updateClusterStorageAccessGroups(clusterId, newStorageAccessGroups);
} catch (CloudRuntimeException e) {
Assert.fail("updateClusterStorageAccessGroups should not throw CloudRuntimeException when cluster has no hosts. Error: " + e.getMessage());
}
Mockito.verify(resourceManager).checkIfAllHostsInUse(Mockito.anyList(), eq(clusterId), eq(null), eq(null));
}

@Test
public void testUpdateClusterStorageAccessGroupsWithEmptyHostsInZone() {
List<String> sagsToDelete = Arrays.asList("tag1", "tag2");
Long clusterId = null;
Long podId = null;
Long zoneId = 3L;

List<Long> emptyHostIdsList = new ArrayList<>();
Mockito.doReturn(emptyHostIdsList).when(resourceManager)
.listOfHostIdsUsingTheStorageAccessGroups(sagsToDelete, clusterId, podId, zoneId);
List<HostVO> emptyHostsInZone = new ArrayList<>();
Mockito.doReturn(emptyHostsInZone).when(hostDao).findByDataCenterId(zoneId);

try {
resourceManager.checkIfAllHostsInUse(sagsToDelete, clusterId, podId, zoneId);
} catch (CloudRuntimeException e) {
Assert.fail("checkIfAllHostsInUse should not throw CloudRuntimeException when zone has no hosts. Error: " + e.getMessage());
}
Mockito.verify(resourceManager).checkIfAllHostsInUse(Mockito.anyList(), eq(null), eq(null), eq(zoneId));
}

@Test
public void testUpdateClusterStorageAccessGroupsWithEmptyHostsInPod() {
List<String> sagsToDelete = Arrays.asList("tag1", "tag2");
Long clusterId = null;
Long podId = 2L;
Long zoneId = null;

List<Long> emptyHostIdsList = new ArrayList<>();
Mockito.doReturn(emptyHostIdsList).when(resourceManager)
.listOfHostIdsUsingTheStorageAccessGroups(sagsToDelete, clusterId, podId, zoneId);
List<HostVO> emptyHostsInPod = new ArrayList<>();
Mockito.doReturn(emptyHostsInPod).when(hostDao).findByPodId(podId, Host.Type.Routing);

try {
resourceManager.checkIfAllHostsInUse(sagsToDelete, clusterId, podId, zoneId);
} catch (CloudRuntimeException e) {
Assert.fail("checkIfAllHostsInUse should not throw CloudRuntimeException when pod has no hosts. Error: " + e.getMessage());
}
Mockito.verify(resourceManager).checkIfAllHostsInUse(Mockito.anyList(), eq(null), eq(podId), eq(null));
}

@Test
public void testCheckIfAllHostsInUseWithEmptyHostsInMultipleLevels() {
List<String> sagsToDelete = Arrays.asList("tag1", "tag2");
Long clusterId = 1L;
Long podId = 2L;
Long zoneId = 3L;

List<Long> emptyHostIdsList = new ArrayList<>();
Mockito.doReturn(emptyHostIdsList).when(resourceManager)
.listOfHostIdsUsingTheStorageAccessGroups(sagsToDelete, clusterId, podId, zoneId);
List<HostVO> emptyHostsInZone = new ArrayList<>();
List<HostVO> emptyHostsInCluster = new ArrayList<>();
List<HostVO> emptyHostsInPod = new ArrayList<>();
Mockito.doReturn(emptyHostsInZone).when(hostDao).findByDataCenterId(zoneId);
Mockito.doReturn(emptyHostsInCluster).when(hostDao).findByClusterId(clusterId, Host.Type.Routing);
Mockito.doReturn(emptyHostsInPod).when(hostDao).findByPodId(podId, Host.Type.Routing);

try {
resourceManager.checkIfAllHostsInUse(sagsToDelete, clusterId, podId, zoneId);
} catch (CloudRuntimeException e) {
Assert.fail("checkIfAllHostsInUse should not throw CloudRuntimeException when all levels have no hosts. Error: " + e.getMessage());
}
Mockito.verify(hostDao).findByDataCenterId(zoneId);
Mockito.verify(hostDao).findByClusterId(clusterId, Host.Type.Routing);
Mockito.verify(hostDao).findByPodId(podId, Host.Type.Routing);
}
}
Loading