shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

Bug #208: HostPool::discover filter outs disabled hosts

Browse Source 
(cherry picked from commit 0ecd07d8efa3cf39d739d65481046f344b7f4c2c)
This commit is contained in:
Ruben S. Montero 2010-03-29 23:58:34 +02:00
parent 15a627f461
commit 84e3d65c3b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/host/HostPool.cc
View File

@ -24,8 +24,8 @@
int HostPool::allocate (
int * oid,
string hostname,
string im_mad_name,
string vmm_mad_name,
string im_mad_name,
string vmm_mad_name,
string tm_mad_name)
{
Host * host;
@ -59,14 +59,14 @@ extern "C"
map<int, string> * discovered_hosts;
string im_mad(values[1]);
int hid;
discovered_hosts = static_cast<map<int, string> *>(_discovered_hosts);
if ( (discovered_hosts == 0) || (num<=0) || (values[0] == 0) )
{
return -1;
}
hid = atoi(values[0]);
im_mad = values[1];
@ -86,13 +86,14 @@ int HostPool::discover(map<int, string> * discovered_hosts)
lock();
sql << "SELECT oid, im_mad FROM "
<< Host::table << " ORDER BY last_mon_time LIMIT 10";
sql << "SELECT oid, im_mad FROM "
<< Host::table << " WHERE state != "
<< Host::DISABLED << " ORDER BY last_mon_time LIMIT 10";
rc = db->exec(sql,discover_cb,(void *) discovered_hosts);
unlock();
return rc;
}