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

F #2228: Fixed problem with try to delete a vm from inactive state

Browse Source
This commit is contained in:
juanmont 2018-09-05 18:05:17 +02:00 committed by Ruben S. Montero
parent ca5b1f7210
commit e89810b70d
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lcm/LifeCycleActions.cc
View File

@ -409,12 +409,36 @@ void LifeCycleManager::shutdown_action(const LCMAction& la, bool hard)
{
int vid = la.vm_id();
VirtualMachine * vm = vmpool->get(vid);
VirtualMachineTemplate quota_tmpl;
string error;
if ( vm == 0 )
{
return;
}
int uid = vm->get_uid();
int gid = vm->get_gid();
std::string memory, cpu;
vm->get_template_attribute("MEMORY", memory);
vm->get_template_attribute("CPU", cpu);
if ( (vm->get_state() == VirtualMachine::SUSPENDED) ||
(vm->get_state() == VirtualMachine::POWEROFF) ||
(vm->get_state() == VirtualMachine::STOPPED) ||
(vm->get_state() == VirtualMachine::UNDEPLOYED))
{
quota_tmpl.add("RUNNING_MEMORY", memory);
quota_tmpl.add("RUNNING_CPU", cpu);
quota_tmpl.add("RUNNING_VMS", 1);
quota_tmpl.add("MEMORY", 0);
quota_tmpl.add("CPU", 0);
quota_tmpl.add("VMS", 0);
}
if (vm->get_state() == VirtualMachine::ACTIVE &&
(vm->get_lcm_state() == VirtualMachine::RUNNING ||
vm->get_lcm_state() == VirtualMachine::UNKNOWN))
@ -452,6 +476,8 @@ void LifeCycleManager::shutdown_action(const LCMAction& la, bool hard)
vm->set_state(VirtualMachine::ACTIVE);
vm->set_state(VirtualMachine::EPILOG);
Quotas::vm_check(uid, gid, &quota_tmpl, error);
vm->set_action(History::TERMINATE_ACTION, la.uid(), la.gid(),
la.req_id());
@ -471,6 +497,8 @@ void LifeCycleManager::shutdown_action(const LCMAction& la, bool hard)
vm->set_state(VirtualMachine::ACTIVE);
vm->set_state(VirtualMachine::EPILOG);
Quotas::vm_check(uid, gid, &quota_tmpl, error);
vm->set_action(History::TERMINATE_ACTION, la.uid(), la.gid(),
la.req_id());