apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10640: Update redundant virtual router allocation algorithm

Browse Source 
Try to put routers to two different primary storages with two hosts, not the same
host.
This commit is contained in:
Sheng Yang 2011-08-09 18:21:28 -07:00
parent 1761024fda
commit 5f31d5008e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -977,12 +977,13 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
avoids[1] = new ExcludeList(); avoids[1] = new ExcludeList();
avoids[1].addCluster(_hostDao.findById(routerToBeAvoid.getHostId()).getClusterId()); avoids[1].addCluster(_hostDao.findById(routerToBeAvoid.getHostId()).getClusterId());
avoids[2] = new ExcludeList(); avoids[2] = new ExcludeList();
avoids[2].addHost(routerToBeAvoid.getHostId());
avoids[3] = new ExcludeList();
List<VolumeVO> volumes = _volumeDao.findByInstanceAndType(routerToBeAvoid.getId(), Type.ROOT); List<VolumeVO> volumes = _volumeDao.findByInstanceAndType(routerToBeAvoid.getId(), Type.ROOT);
if (volumes != null && volumes.size() != 0) { if (volumes != null && volumes.size() != 0) {
avoids[3].addPool(volumes.get(0).getPoolId()); avoids[2].addPool(volumes.get(0).getPoolId());
} }
avoids[2].addHost(routerToBeAvoid.getHostId());
avoids[3] = new ExcludeList();
avoids[3].addHost(routerToBeAvoid.getHostId());
avoids[4] = new ExcludeList(); avoids[4] = new ExcludeList();
for (int i = 0; i < retryIndex; i++) { for (int i = 0; i < retryIndex; i++) {