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

B #5106: rollback quotas when when RESUME fails (#244)

Browse Source
This commit is contained in:
Christian González 2020-09-24 18:21:26 +02:00 committed by GitHub
parent 834c97bfb2
commit 0226e8845c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/rm/RequestManagerVirtualMachine.cc
View File

@ -478,16 +478,7 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
VMActions::Action action;
VirtualMachineTemplate quota_tmpl;
// Compatibility with 4.x
if (action_st == "shutdown-hard" || action_st == "delete" )
{
action_st = "terminate-hard";
}
else if (action_st == "shutdown")
{
action_st = "terminate";
}
RequestAttributes& att_aux(att);
VMActions::action_from_str(action_st, action);
@ -499,48 +490,21 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
return;
}
RequestAttributes& att_aux(att);
auto vm = get_vm_ro(id, att);
if ( auto vm = get_vm(id, att) )
{
// Check if the action is supported for imported VMs
if (vm->is_imported() && !vm->is_imported_action_supported(action))
{
att.resp_msg = "Action \"" + action_st + "\" is not supported for "
"imported VMs";
failure_response(ACTION, att);
return;
}
// Generate quota information for resume action
if (action == VMActions::RESUME_ACTION)
{
vm->get_template_attribute("MEMORY", memory);
vm->get_template_attribute("CPU", cpu);
quota_tmpl.add("RUNNING_MEMORY", memory);
quota_tmpl.add("RUNNING_CPU", cpu);
quota_tmpl.add("RUNNING_VMS", 1);
quota_tmpl.add("VMS", 0);
quota_tmpl.add("MEMORY", 0);
quota_tmpl.add("CPU", 0);
att_aux.uid = vm->get_uid();
att_aux.gid = vm->get_gid();
}
}
else
if (vm == nullptr)
{
att.resp_id = id;
failure_response(NO_EXISTS, att);
return;
}
if (action == VMActions::RESUME_ACTION && !quota_authorization(&quota_tmpl,
Quotas::VIRTUALMACHINE, att_aux, att.resp_msg))
// Check if the action is supported for imported VMs
if (vm->is_imported() && !vm->is_imported_action_supported(action))
{
failure_response(ACTION, att);
att.resp_msg = "Action \"" + action_st + "\" is not supported for "
"imported VMs";
return;
}
@ -565,7 +529,35 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
rc = dm->suspend(id, att, error);
break;
case VMActions::RESUME_ACTION:
// Generate quota information for resume action
vm->get_template_attribute("MEMORY", memory);
vm->get_template_attribute("CPU", cpu);
quota_tmpl.add("RUNNING_MEMORY", memory);
quota_tmpl.add("RUNNING_CPU", cpu);
quota_tmpl.add("RUNNING_VMS", 1);
quota_tmpl.add("VMS", 0);
quota_tmpl.add("MEMORY", 0);
quota_tmpl.add("CPU", 0);
att_aux.uid = vm->get_uid();
att_aux.gid = vm->get_gid();
if (!quota_authorization(&quota_tmpl, Quotas::VIRTUALMACHINE, att_aux, att.resp_msg))
{
failure_response(ACTION, att);
return;
}
rc = dm->resume(id, att, error);
if (rc < 0)
{
quota_rollback(&quota_tmpl, Quotas::VIRTUALMACHINE, att_aux);
}
break;
case VMActions::REBOOT_ACTION:
rc = dm->reboot(id, false, att, error);