This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new e09fd2e26b9 Fixup: Optimize getRouterHealthChecksConfig method (#8677)
e09fd2e26b9 is described below
commit e09fd2e26b9910f95a87cc739aaee7ed54bd66bd
Author: Vishesh <[email protected]>
AuthorDate: Wed Feb 21 13:54:11 2024 +0530
Fixup: Optimize getRouterHealthChecksConfig method (#8677)
---
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index de2d9d80d2b..d208021e833 100644
---
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1791,16 +1791,14 @@ Configurable, StateListener<VirtualMachine.State,
VirtualMachine.Event, VirtualM
}
SearchBuilder<UserVmJoinVO> sbvm =
userVmJoinDao.createSearchBuilder();
sbvm.and("networkId", sbvm.entity().getNetworkId(),
SearchCriteria.Op.EQ);
+ sbvm.and("state", sbvm.entity().getState(), SearchCriteria.Op.EQ);
SearchCriteria<UserVmJoinVO> scvm = sbvm.create();
scvm.setParameters("networkId", routerJoinVO.getNetworkId());
+ scvm.setParameters("state", VirtualMachine.State.Running);
List<UserVmJoinVO> vms = userVmJoinDao.search(scvm, null);
boolean isDhcpSupported =
_ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(),
Service.Dhcp);
boolean isDnsSupported =
_ntwkSrvcDao.areServicesSupportedInNetwork(routerJoinVO.getNetworkId(),
Service.Dns);
for (UserVmJoinVO vm : vms) {
- if (vm.getState() != VirtualMachine.State.Running) {
- continue;
- }
-
vmsData.append("vmName=").append(vm.getName())
.append(",macAddress=").append(vm.getMacAddress())
.append(",ip=").append(vm.getIpAddress())
