shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Feature #1338: Add new param to enforce host capacity in one.vm.deploy and one.vm.migrate

Browse Source
This commit is contained in:
Carlos Martín 2012-12-11 15:41:59 +01:00
parent 085fa15535
commit 7d1df849be
2 changed files with 75 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/RequestManagerVirtualMachine.h
View File

@ -62,7 +62,9 @@ protected:
string& vnm,
string& tm,
string& ds_location,
int& ds_id,
int& ds_id,
int& free_cpu,
int& free_mem,
RequestAttributes& att,
PoolObjectAuth& host_perms);
@ -106,7 +108,7 @@ public:
VirtualMachineDeploy():
RequestManagerVirtualMachine("VirtualMachineDeploy",
"Deploys a virtual machine",
"A:sii")
"A:siib")
{
auth_op = AuthRequest::ADMIN;
};
@ -126,7 +128,7 @@ public:
VirtualMachineMigrate():
RequestManagerVirtualMachine("VirtualMachineMigrate",
"Migrates a virtual machine",
"A:siib")
"A:siibb")
{
auth_op = AuthRequest::ADMIN;
};

80
src/rm/RequestManagerVirtualMachine.cc
View File

@ -102,6 +102,8 @@ int RequestManagerVirtualMachine::get_host_information(int hid,
string& tm,
string& ds_location,
int& ds_id,
int& free_cpu,
int& free_mem,
RequestAttributes& att,
PoolObjectAuth& host_perms)
{
@ -129,6 +131,9 @@ int RequestManagerVirtualMachine::get_host_information(int hid,
vmm = host->get_vmm_mad();
vnm = host->get_vnm_mad();
free_cpu = host->get_share_max_cpu() - host->get_share_cpu_usage();
free_mem = host->get_share_max_mem() - host->get_share_mem_usage();
host->get_permissions(host_perms);
cluster_id = host->get_cluster_id();
@ -386,15 +391,18 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
string tm_mad;
string ds_location;
int ds_id;
int free_cpu;
int free_mem;
int id = xmlrpc_c::value_int(paramList.getInt(1));
int hid = xmlrpc_c::value_int(paramList.getInt(2));
int id = xmlrpc_c::value_int(paramList.getInt(1));
int hid = xmlrpc_c::value_int(paramList.getInt(2));
bool enforce = xmlrpc_c::value_boolean(paramList.getBoolean(3));
bool auth = false;
if (get_host_information(
hid, hostname, vmm_mad, vnm_mad, tm_mad, ds_location, ds_id, att,
host_perms) != 0)
hid, hostname, vmm_mad, vnm_mad, tm_mad, ds_location, ds_id,
free_cpu, free_mem, att, host_perms) != 0)
{
return;
}
@ -421,6 +429,30 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
return;
}
if ( enforce )
{
int vm_cpu, vm_mem, vm_disk;
vm->get_requirements(vm_cpu, vm_mem, vm_disk);
if ( free_cpu < vm_cpu || free_mem < vm_mem )
{
ostringstream oss;
oss << object_name(PoolObjectSQL::HOST)
<< " [" << hid << "] does not have enough capacity. CPU: Free "
<< free_cpu << " Requested " << vm_cpu << ", MEMORY: Free "
<< free_mem << " Requested " << vm_mem;
failure_response(ACTION,
request_error(oss.str(),""),
att);
vm->unlock();
return;
}
}
if ( add_history(
vm,hid,hostname,vmm_mad,vnm_mad,tm_mad,ds_location,ds_id,att) != 0)
{
@ -453,21 +485,25 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
string tm_mad;
string ds_location;
int ds_id;
int free_cpu;
int free_mem;
PoolObjectAuth aux_perms;
int current_ds_id;
string aux_st;
int current_hid;
int aux_int;
int id = xmlrpc_c::value_int(paramList.getInt(1));
int hid = xmlrpc_c::value_int(paramList.getInt(2));
bool live = xmlrpc_c::value_boolean(paramList.getBoolean(3));
int id = xmlrpc_c::value_int(paramList.getInt(1));
int hid = xmlrpc_c::value_int(paramList.getInt(2));
bool live = xmlrpc_c::value_boolean(paramList.getBoolean(3));
bool enforce = xmlrpc_c::value_boolean(paramList.getBoolean(4));
bool auth = false;
if (get_host_information(
hid, hostname, vmm_mad, vnm_mad, tm_mad, ds_location, ds_id, att,
host_perms) != 0)
hid, hostname, vmm_mad, vnm_mad, tm_mad, ds_location, ds_id,
free_cpu, free_mem, att, host_perms) != 0)
{
return;
}
@ -502,7 +538,7 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
if (get_host_information(
current_hid, aux_st, aux_st, aux_st, aux_st, aux_st, current_ds_id,
att, aux_perms) != 0)
aux_int, aux_int, att, aux_perms) != 0)
{
return;
}
@ -529,6 +565,30 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
return;
}
if ( enforce )
{
int vm_cpu, vm_mem, vm_disk;
vm->get_requirements(vm_cpu, vm_mem, vm_disk);
if ( free_cpu < vm_cpu || free_mem < vm_mem )
{
ostringstream oss;
oss << object_name(PoolObjectSQL::HOST)
<< " [" << hid << "] does not have enough capacity. CPU: Free "
<< free_cpu << " Requested " << vm_cpu << ", MEMORY: Free "
<< free_mem << " Requested " << vm_mem;
failure_response(ACTION,
request_error(oss.str(),""),
att);
vm->unlock();
return;
}
}
if ( add_history(vm, hid, hostname, vmm_mad, vnm_mad, tm_mad, ds_location,
ds_id, att) != 0)
{