Skip to content

Commit e09fd2e

Browse files
authored
Fixup: Optimize getRouterHealthChecksConfig method (apache#8677)
1 parent af942e2 commit e09fd2e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1791,16 +1791,14 @@ protected Map<String, String> getRouterHealthChecksConfig(final DomainRouterVO r
17911791
}
17921792
SearchBuilder<UserVmJoinVO> sbvm = userVmJoinDao.createSearchBuilder();
17931793
sbvm.and("networkId", sbvm.entity().getNetworkId(), SearchCriteria.Op.EQ);
1794+
sbvm.and("state", sbvm.entity().getState(), SearchCriteria.Op.EQ);
17941795
SearchCriteria<UserVmJoinVO> scvm = sbvm.create();
17951796
scvm.setParameters("networkId", routerJoinVO.getNetworkId());
1797+
scvm.setParameters("state", VirtualMachine.State.Running);
17961798
List<UserVmJoinVO> vms = userVmJoinDao.search(scvm, null);
17971799
boolean isDhcpSupported = _ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), Service.Dhcp);
17981800
boolean isDnsSupported = _ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(), Service.Dns);
17991801
for (UserVmJoinVO vm : vms) {
1800-
if (vm.getState() != VirtualMachine.State.Running) {
1801-
continue;
1802-
}
1803-
18041802
vmsData.append("vmName=").append(vm.getName())
18051803
.append(",macAddress=").append(vm.getMacAddress())
18061804
.append(",ip=").append(vm.getIpAddress())

0 commit comments

Comments
 (0)