Skip to content

Commit 6fa3fe3

Browse files
committed
get cpu archs only if there are suitable hosts
1 parent 90737e5 commit 6fa3fe3

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

server/src/main/java/com/cloud/server/ManagementServerImpl.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,9 +1614,11 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
16141614
}
16151615

16161616
// Only list hosts of the same architecture as the source Host in a multi-arch zone
1617-
List<CPU.CPUArch> clusterArchs = ApiDBUtils.listZoneClustersArchs(vm.getDataCenterId());
1618-
if (CollectionUtils.isNotEmpty(clusterArchs) && clusterArchs.size() > 1 && !suitableHosts.isEmpty()) {
1619-
suitableHosts = suitableHosts.stream().filter(h -> h.getArch() == srcHost.getArch()).collect(Collectors.toList());
1617+
if (!suitableHosts.isEmpty()) {
1618+
List<CPU.CPUArch> clusterArchs = ApiDBUtils.listZoneClustersArchs(vm.getDataCenterId());
1619+
if (CollectionUtils.isNotEmpty(clusterArchs) && clusterArchs.size() > 1) {
1620+
suitableHosts = suitableHosts.stream().filter(h -> h.getArch() == srcHost.getArch()).collect(Collectors.toList());
1621+
}
16201622
}
16211623

16221624
return new Ternary<>(otherHosts, suitableHosts, requiresStorageMotion);

0 commit comments

Comments
 (0)