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

merge from master a72646307b 

findDirectAgentToLoad ordered by clusterId
This commit is contained in:
anthony 2011-01-04 14:16:00 -08:00
parent 5bceb005ef
commit 7ee7c0a79b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/host/dao/HostDao.java
View File

@ -67,7 +67,7 @@ public interface HostDao extends GenericDao<HostVO, Long> {
*/
List<HostVO> findDirectlyConnectedHosts();
List<HostVO> findDirectAgentToLoad(long msid, long clusterId, long lastPingSecondsAfter, Long limit);
List<HostVO> findDirectAgentToLoad(long msid, long lastPingSecondsAfter, Long limit);
/**

14
core/src/com/cloud/host/dao/HostDaoImpl.java
View File

@ -187,15 +187,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
UnmanagedDirectConnectSearch = createSearchBuilder();
UnmanagedDirectConnectSearch.and("resource", UnmanagedDirectConnectSearch.entity().getResource(), SearchCriteria.Op.NNULL);
UnmanagedDirectConnectSearch.and("server", UnmanagedDirectConnectSearch.entity().getManagementServerId(), SearchCriteria.Op.NULL);
UnmanagedDirectConnectSearch.and("avoidstatus", UnmanagedDirectConnectSearch.entity().getStatus(), SearchCriteria.Op.NEQ);
UnmanagedDirectConnectSearch.and("clusterId", UnmanagedDirectConnectSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
UnmanagedDirectConnectSearch.and("lastPinged", UnmanagedDirectConnectSearch.entity().getLastPinged(), SearchCriteria.Op.LTEQ);
/*
UnmanagedDirectConnectSearch.op(SearchCriteria.Op.OR, "managementServerId", UnmanagedDirectConnectSearch.entity().getManagementServerId(), SearchCriteria.Op.EQ);
UnmanagedDirectConnectSearch.and("lastPinged", UnmanagedDirectConnectSearch.entity().getLastPinged(), SearchCriteria.Op.LTEQ);
UnmanagedDirectConnectSearch.cp();
UnmanagedDirectConnectSearch.cp();
*/
UnmanagedDirectConnectSearch.done();
_statusAttr = _allAttributes.get("status");
@ -247,12 +239,10 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
}
@Override
public List<HostVO> findDirectAgentToLoad(long msid, long clusterId, long lastPingSecondsAfter, Long limit) {
public List<HostVO> findDirectAgentToLoad(long msid, long lastPingSecondsAfter, Long limit) {
SearchCriteria sc = UnmanagedDirectConnectSearch.create();
sc.setParameters("avoidstatus", Status.Removed.toString());
sc.setParameters("clusterId", clusterId);
sc.setParameters("lastPinged", lastPingSecondsAfter);
return search(sc, new Filter(HostVO.class, "id", true, 0L, limit));
return search(sc, new Filter(HostVO.class, "clusterId", true, 0L, limit));
}
@Override