apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10732: fix console proxy assignment issue

Browse Source
This commit is contained in:
Kelven Yang 2011-07-14 21:52:16 -07:00
parent 18003deedf
commit 1081a3cfaa
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java
View File

@ -19,6 +19,7 @@
package com.cloud.consoleproxy; package com.cloud.consoleproxy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -30,29 +31,48 @@ import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.utils.NumbersUtil; import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.ComponentLocator;
import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.ConsoleProxyVO;
import edu.emory.mathcs.backport.java.util.Collections;
@Local(value={ConsoleProxyAllocator.class}) @Local(value={ConsoleProxyAllocator.class})
public class ConsoleProxyBalanceAllocator implements ConsoleProxyAllocator { public class ConsoleProxyBalanceAllocator implements ConsoleProxyAllocator {
private String _name; private String _name;
private int _maxSessionCount = ConsoleProxyManager.DEFAULT_PROXY_CAPACITY;
private final Random _rand = new Random(System.currentTimeMillis()); private final Random _rand = new Random(System.currentTimeMillis());
@Override @Override
public ConsoleProxyVO allocProxy(List<ConsoleProxyVO> candidates, Map<Long, Integer> loadInfo, long dataCenterId) { public ConsoleProxyVO allocProxy(List<ConsoleProxyVO> candidates, final Map<Long, Integer> loadInfo, long dataCenterId) {
if(candidates != null) { if(candidates != null) {
List<ConsoleProxyVO> allocationList = new ArrayList<ConsoleProxyVO>(); List<ConsoleProxyVO> allocationList = new ArrayList<ConsoleProxyVO>();
for(ConsoleProxyVO proxy : candidates) { for(ConsoleProxyVO proxy : candidates) {
Integer load = loadInfo.get(proxy.getId()); allocationList.add(proxy);
if(load == null || load < _maxSessionCount) { }
allocationList.add(proxy);
} Collections.sort(candidates, new Comparator<ConsoleProxyVO> () {
} @Override
public int compare(ConsoleProxyVO x, ConsoleProxyVO y) {
Integer loadOfX = loadInfo.get(x.getId());
Integer loadOfY = loadInfo.get(y.getId());
if(loadOfX != null && loadOfY != null) {
if(loadOfX < loadOfY)
return -1;
else if(loadOfX > loadOfY)
return 1;
return 0;
} else if(loadOfX == null && loadOfY == null) {
return 0;
} else {
if(loadOfX == null)
return -1;
return 1;
}
}
});
if(allocationList.size() > 0) if(allocationList.size() > 0)
return allocationList.get(_rand.nextInt(allocationList.size())); return allocationList.get(0);
} }
return null; return null;
} }

4
server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java
View File

@ -50,10 +50,10 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im
// //
private static final String PROXY_ASSIGNMENT_MATRIX = private static final String PROXY_ASSIGNMENT_MATRIX =
"SELECT c.id, count(runningVm.id) AS count " + "SELECT c.id, count(runningVm.id) AS count " +
" FROM console_proxy AS c LEFT JOIN" + " FROM console_proxy AS c LEFT JOIN vm_instance AS i ON c.id=i.id LEFT JOIN" +
" (SELECT v.id AS id, v.proxy_id AS proxy_id FROM vm_instance AS v WHERE " + " (SELECT v.id AS id, v.proxy_id AS proxy_id FROM vm_instance AS v WHERE " +
" (v.state='Running' OR v.state='Creating' OR v.state='Starting' OR v.state='Migrating')) " + " (v.state='Running' OR v.state='Creating' OR v.state='Starting' OR v.state='Migrating')) " +
" AS runningVm ON c.id = runningVm.proxy_id" + " AS runningVm ON c.id = runningVm.proxy_id WHERE i.state='Running' " +
" GROUP BY c.id"; " GROUP BY c.id";
// //