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

Feature #4369: Do not add objects to cluster -1 on allocate

Browse Source
This commit is contained in:
Carlos Martín 2016-03-11 15:44:56 +01:00
parent 621a186947
commit 5c54e1c5f2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rm/RequestManagerAllocate.cc
View File

@ -273,7 +273,11 @@ int VirtualNetworkAllocate::pool_allocate(
VirtualNetworkTemplate * vtmpl=static_cast<VirtualNetworkTemplate *>(tmpl);
set<int> cluster_ids;
cluster_ids.insert(cluster_id);
if (cluster_id != ClusterPool::NONE_CLUSTER_ID)
{
cluster_ids.insert(cluster_id);
}
return vpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,-1,
vtmpl, &id, cluster_ids, att.resp_msg);
@ -630,7 +634,11 @@ int HostAllocate::pool_allocate(
HostPool * hpool = static_cast<HostPool *>(pool);
set<int> cluster_ids;
cluster_ids.insert(cluster_id);
if (cluster_id != ClusterPool::NONE_CLUSTER_ID)
{
cluster_ids.insert(cluster_id);
}
return hpool->allocate(&id, host, im_mad, vmm_mad, vnm_mad,
cluster_ids, att.resp_msg);
@ -718,7 +726,11 @@ int DatastoreAllocate::pool_allocate(
DatastoreTemplate * ds_tmpl = static_cast<DatastoreTemplate *>(tmpl);
set<int> cluster_ids;
cluster_ids.insert(cluster_id);
if (cluster_id != ClusterPool::NONE_CLUSTER_ID)
{
cluster_ids.insert(cluster_id);
}
return dspool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
ds_tmpl, &id, cluster_ids, att.resp_msg);