shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-22 17:57:46 +03:00
Code Releases Wiki Activity

feature #201: When a cluster is deleted, the hosts assigned to it are moved to the default cluster.

Browse Source
This commit is contained in:
Carlos Martín 2010-07-09 14:51:19 +02:00 committed by Ruben S. Montero
parent 00ebe0dd36
commit ddb9f27ca0
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/HostPool.h
View File

@ -196,10 +196,7 @@ public:
*
* @return 0 on success
*/
int drop_cluster(int clid)
{
return cluster_pool.drop(clid, db);
};
int drop_cluster(int clid);
/**
* Dumps the cluster pool in XML format.

50
src/host/HostPool.cc
View File

@ -20,6 +20,7 @@
#include "HostPool.h"
#include "ClusterPool.h"
#include "NebulaLog.h"
int HostPool::init_cb(void *nil, int num, char **values, char **names)
{
@ -54,9 +55,13 @@ HostPool::HostPool(SqlDB* db):PoolSQL(db,Host::table)
// Insert the "default" cluster
int rc = cluster_pool.insert(0, default_name, db);
// TODO Check and log error
}
if(rc != 0)
{
NebulaLog::log("HOST",Log::ERROR,
"Cluster pool is empty but couldn't create default cluster.");
}
}
}
/* -------------------------------------------------------------------------- */
@ -171,3 +176,44 @@ int HostPool::dump(ostringstream& oss, const string& where)
return rc;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int HostPool::drop_cluster(int clid)
{
int rc;
map<int, string>::iterator it;
it = cluster_pool.cluster_names.find(clid);
// try to drop the cluster from the pool and DB
rc = cluster_pool.drop(clid, db);
// Move the hosts assigned to the deleted cluster to the default one
if( rc == 0 )
{
// Search the hosts assigned to this cluster
Host* host;
vector<int> hids;
vector<int>::iterator hid_it;
string cluster_name = it->second;
string where = "cluster = '" + cluster_name + "'";
search(hids, Host::table, where);
for ( hid_it=hids.begin() ; hid_it < hids.end(); hid_it++ )
{
host = get(*hid_it, true);
remove_cluster(host);
update(host);
host->unlock();
}
}
return rc;
}