Skip to content

Commit 4b31782

Browse files
Autoscale VM load balancing rules improvements
1 parent 5c1f931 commit 4b31782

File tree

5 files changed

+101
-134
lines changed

5 files changed

+101
-134
lines changed

engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDao.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ public interface LoadBalancerVMMapDao extends GenericDao<LoadBalancerVMMapVO, Lo
4242
LoadBalancerVMMapVO findByLoadBalancerIdAndVmIdVmIp(long loadBalancerId, long instanceId, String instanceIp);
4343

4444
void remove(long id, long instanceId, String instanceIp, Boolean revoke);
45+
4546
int expungeByVmList(List<Long> vmIds, Long batchSize);
4647
}

engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public void remove(long loadBalancerId, long instanceId, String instanceIp, Bool
6464
expunge(sc);
6565
}
6666

67-
6867
@Override
6968
public List<LoadBalancerVMMapVO> listByInstanceId(long instanceId) {
7069
SearchCriteria<LoadBalancerVMMapVO> sc = createSearchCriteria();

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@ private UserVmVO startNewVM(long vmId) {
20022002
}
20032003

20042004
private boolean assignLBruleToNewVm(long vmId, AutoScaleVmGroupVO asGroup) {
2005-
List<Long> lstVmId = new ArrayList<Long>();
2005+
List<Long> vmIds = new ArrayList<>();
20062006
long lbId = asGroup.getLoadBalancerId();
20072007

20082008
List<LoadBalancerVMMapVO> lbVmMapVos = lbVmMapDao.listByLoadBalancerId(lbId);
@@ -2015,9 +2015,9 @@ private boolean assignLBruleToNewVm(long vmId, AutoScaleVmGroupVO asGroup) {
20152015
}
20162016
}
20172017
}
2018-
lstVmId.add(new Long(vmId));
2018+
vmIds.add(new Long(vmId));
20192019
try {
2020-
return loadBalancingRulesService.assignToLoadBalancer(lbId, lstVmId, new HashMap<>(), true);
2020+
return loadBalancingRulesService.assignToLoadBalancer(lbId, vmIds, new HashMap<>(), true);
20212021
} catch (CloudRuntimeException ex) {
20222022
logger.warn("Caught exception: ", ex);
20232023
return false;

0 commit comments

Comments
 (0)