etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update redundant router status even router is down 

We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
This commit is contained in:
Sheng Yang 2011-08-18 22:49:51 -07:00
parent e9c879fbb8
commit b34750c6ff
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -846,8 +846,8 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
@Override
public void run() {
try {
final List<DomainRouterVO> routers = _routerDao.listVirtualUpByHostId(null);
s_logger.debug("Found " + routers.size() + " running routers. ");
final List<DomainRouterVO> routers = _routerDao.listVirtualByHostId(null);
s_logger.debug("Found " + routers.size() + " routers. ");
updateRoutersRedundantState(routers);

9
server/src/com/cloud/vm/dao/DomainRouterDao.java
View File

@ -62,6 +62,15 @@ public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long> {
public List<DomainRouterVO> listByHostId(Long hostId);
public List<DomainRouterVO> listByLastHostId(Long hostId);
/**
* list virtual machine routers by host id.
* pass in null to get all
* virtual machine routers.
* @param hostId id of the host. null if to get all.
* @return list of DomainRouterVO
*/
public List<DomainRouterVO> listVirtualByHostId(Long hostId);
/**
* list virtual machine routers by host id. exclude destroyed, stopped, expunging VM,
* pass in null to get all

10
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
View File

@ -144,6 +144,16 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
return listBy(sc);
}
@Override
public List<DomainRouterVO> listVirtualByHostId(Long hostId) {
SearchCriteria<DomainRouterVO> sc = HostUpSearch.create();
if (hostId != null) {
sc.setParameters("host", hostId);
}
sc.setJoinParameters("network", "guestType", GuestIpType.Virtual);
return listBy(sc);
}
@Override
public List<DomainRouterVO> listVirtualUpByHostId(Long hostId) {
SearchCriteria<DomainRouterVO> sc = HostUpSearch.create();