From 4208d6ccd1ef8e76abd16a0cd6ce46362783cb3f Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Thu, 30 Dec 2010 14:14:56 -0800
Subject: [PATCH] port 3b1481598e4365b0d3925fa607804d28e433753e from 2.1.x

---
 server/src/com/cloud/host/dao/HostDao.java     | 2 +-
 server/src/com/cloud/host/dao/HostDaoImpl.java | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/host/dao/HostDao.java b/server/src/com/cloud/host/dao/HostDao.java
index a803e1c1f3f..f9b6fd6bd93 100644
--- a/server/src/com/cloud/host/dao/HostDao.java
+++ b/server/src/com/cloud/host/dao/HostDao.java
@@ -67,7 +67,7 @@ public interface HostDao extends GenericDao<HostVO, Long> {
 	 */
 	List<HostVO> findDirectlyConnectedHosts();
 	
-    List<HostVO> findDirectAgentToLoad(long msid, long lastPingSecondsAfter, Long limit);
+    List<HostVO> findDirectAgentToLoad(long msid, long clusterId, long lastPingSecondsAfter, Long limit);
 	
 
 	/**
diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java
index d23450747ee..e52e56a9015 100644
--- a/server/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostDaoImpl.java
@@ -190,6 +190,8 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
         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.op(SearchCriteria.Op.OR, "managementServerId", UnmanagedDirectConnectSearch.entity().getManagementServerId(), SearchCriteria.Op.EQ);
         UnmanagedDirectConnectSearch.and("lastPinged", UnmanagedDirectConnectSearch.entity().getLastPinged(), SearchCriteria.Op.LTEQ);
@@ -246,9 +248,10 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     }
     
     @Override
-    public List<HostVO> findDirectAgentToLoad(long msid, long lastPingSecondsAfter, Long limit) {
+    public List<HostVO> findDirectAgentToLoad(long msid, long clusterId, long lastPingSecondsAfter, Long limit) {
     	SearchCriteria<HostVO> sc = UnmanagedDirectConnectSearch.create();
-    	sc.setParameters("avoidstatus", Status.Removed.toString());
+    	sc.setParameters("avoidstatus", Status.Removed.toString());
+    	sc.setParameters("clusterId", clusterId);
     //	sc.setParameters("lastPinged", lastPingSecondsAfter);
     	//sc.setParameters("managementServerId", msid);