Skip to content

Commit 67ae519

Browse files
addressed comments
1 parent ded089a commit 67ae519

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ public void propagateMSListToAgents() {
171171
logger.debug("Propagating management server list update to agents");
172172
final String lbAlgorithm = getLBAlgorithmName();
173173
List<DataCenterVO> zones = dataCenterDao.listAll();
174+
Long lbCheckInterval = getLBPreferredHostCheckInterval(null);
174175
for (DataCenterVO zone : zones) {
175176
List<Long> zoneHostIds = new ArrayList<>();
176177
List<Long> nonRoutingHostIds = getAllAgentBasedNonRoutingHostsFromDB(zone.getId());
@@ -183,23 +184,21 @@ public void propagateMSListToAgents() {
183184
zoneHostIds.addAll(hostIds);
184185
}
185186
zoneHostIds.sort(Comparator.comparingLong(x -> x));
186-
Long lbCheckInterval = getLBPreferredHostCheckInterval(null);
187187
for (Long nonRoutingHostId : nonRoutingHostIds) {
188-
setupMSList(nonRoutingHostId, zone.getId(), zoneHostIds, lbCheckInterval);
188+
setupMSList(nonRoutingHostId, zone.getId(), zoneHostIds, lbAlgorithm, lbCheckInterval);
189189
}
190190
for (Long clusterId : clusterIds) {
191191
lbCheckInterval = getLBPreferredHostCheckInterval(clusterId);
192192
List<Long> hostIds = clusterHostIdsMap.get(clusterId);
193193
for (Long hostId : hostIds) {
194-
setupMSList(hostId, zone.getId(), zoneHostIds, lbCheckInterval);
194+
setupMSList(hostId, zone.getId(), zoneHostIds, lbAlgorithm, lbCheckInterval);
195195
}
196196
}
197197
}
198198
}
199199

200-
private void setupMSList(final Long hostId, final Long dcId, final List<Long> orderedHostIdList, final Long lbCheckInterval) {
200+
private void setupMSList(final Long hostId, final Long dcId, final List<Long> orderedHostIdList, final String lbAlgorithm, final Long lbCheckInterval) {
201201
final List<String> msList = getManagementServerList(hostId, dcId, orderedHostIdList);
202-
final String lbAlgorithm = getLBAlgorithmName();
203202
final SetupMSListCommand cmd = new SetupMSListCommand(msList, lbAlgorithm, lbCheckInterval);
204203
final Answer answer = agentManager.easySend(hostId, cmd);
205204
if (answer == null || !answer.getResult()) {

0 commit comments

Comments
 (0)