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

bug #4593: Moved history closing to the action, where the capacity is

Browse Source 
removed from the host. FAILURE states does not need update
This commit is contained in:
Ruben S. Montero 2016-06-23 13:34:32 +02:00
parent 58d725682e
commit c637d795a4
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lcm/LifeCycleActions.cc
View File

@ -269,6 +269,18 @@ void LifeCycleManager::migrate_action(int vid)
else //VirtualMachine::UNKNOWN
{
vm->set_state(VirtualMachine::PROLOG_MIGRATE_UNKNOWN);
vm->set_previous_running_etime(the_time);
vm->set_previous_etime(the_time);
vm->set_previous_action(History::MIGRATE_ACTION);
vm->set_previous_reason(History::USER);
vm->set_previous_vm_info();
vmpool->update_previous_history(vm);
}
vm->set_state(VirtualMachine::ACTIVE);
@ -344,9 +356,11 @@ void LifeCycleManager::live_migrate_action(int vid)
vm->set_stime(time(0));
vmpool->update_history(vm);
vm->set_previous_action(History::LIVE_MIGRATE_ACTION);
vmpool->update_history(vm);
vmpool->update_previous_history(vm);
vm->get_requirements(cpu, mem, disk, pci);

7
src/lcm/LifeCycleStates.cc
View File

@ -683,11 +683,7 @@ void LifeCycleManager::prolog_success_action(int vid)
break;
case VirtualMachine::PROLOG_MIGRATE_UNKNOWN:
case VirtualMachine::PROLOG_MIGRATE_UNKNOWN_FAILURE: //recover success
vm->set_previous_reason(History::USER);
vm->set_previous_action(History::MIGRATE_ACTION);
vmpool->update_previous_history(vm);
case VirtualMachine::PROLOG_MIGRATE_UNKNOWN_FAILURE:
case VirtualMachine::PROLOG:
case VirtualMachine::PROLOG_FAILURE: //recover success
action = VirtualMachineManager::DEPLOY;
@ -736,6 +732,7 @@ void LifeCycleManager::prolog_success_action(int vid)
vm->set_vm_info();
vm->set_reason(History::USER);
vm->set_action(History::MIGRATE_ACTION);
vmpool->update_history(vm);