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

feature #407: Solves deadlock in cluster-host pool interaction

Browse Source
This commit is contained in:
Ruben S. Montero 2011-03-18 19:42:55 +01:00
parent 3a833878c0
commit 546aa9e8f6
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/rm/RequestManagerClusterAdd.cc
View File

@ -72,14 +72,6 @@ void RequestManager::ClusterAdd::execute(
}
}
// Check if host exists
host = ClusterAdd::hpool->get(hid,true);
if ( host == 0 )
{
goto error_host_get;
}
// Check if cluster exists
cluster = ClusterAdd::cpool->get(clid,true);
@ -88,8 +80,16 @@ void RequestManager::ClusterAdd::execute(
goto error_cluster_get;
}
// Check if host exists
host = ClusterAdd::hpool->get(hid,true);
if ( host == 0 )
{
goto error_host_get;
}
// Set cluster
rc = host->set_cluster( cluster->get_name() );
rc = host->set_cluster(cluster->get_name());
if ( rc != 0 )
{
@ -100,6 +100,7 @@ void RequestManager::ClusterAdd::execute(
ClusterAdd::hpool->update(host);
host->unlock();
cluster->unlock();
// All nice, return success to the client
@ -122,16 +123,17 @@ error_authorize:
goto error_common;
error_host_get:
cluster->unlock();
oss.str(get_error(method_name, "HOST", hid));
goto error_common;
error_cluster_get:
host->unlock();
oss.str(get_error(method_name, "CLUSTER", clid));
goto error_common;
error_cluster_add:
host->unlock();
cluster->unlock();
oss.str(action_error(method_name, "USE", "CLUSTER", clid, rc));
goto error_common;