shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-23 21:57:43 +03:00
Code Releases Wiki Activity

Revert "Bug #1374: Do not force a poll action after a migrate/shutdown failure, the VM will be monitored in the next cycle because it is in 'running' state"

Browse Source 
This reverts commit 6d07ed6e9a615a3de59f668610bd29a83125ddff.
This commit is contained in:
Carlos Martín 2012-09-03 18:50:55 +02:00
parent 8b00256ddd
commit 7689f16d8b
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lcm/LifeCycleStates.cc
View File

@ -150,6 +150,9 @@ void LifeCycleManager::save_failure_action(int vid)
int cpu,mem,disk;
time_t the_time = time(0);
Nebula& nd = Nebula::instance();
VirtualMachineManager * vmm = nd.get_vmm();
//----------------------------------------------------
// RUNNING STATE FROM SAVE_MIGRATE
//----------------------------------------------------
@ -194,10 +197,15 @@ void LifeCycleManager::save_failure_action(int vid)
" Assuming that the VM is still RUNNING (will poll VM).");
//----------------------------------------------------
vmm->trigger(VirtualMachineManager::POLL,vid);
}
else if ( vm->get_lcm_state() == VirtualMachine::SAVE_SUSPEND ||
vm->get_lcm_state() == VirtualMachine::SAVE_STOP )
{
Nebula& nd = Nebula::instance();
VirtualMachineManager * vmm = nd.get_vmm();
//----------------------------------------------------
// RUNNING STATE FROM SAVE_SUSPEND OR SAVE_STOP
//----------------------------------------------------
@ -210,6 +218,8 @@ void LifeCycleManager::save_failure_action(int vid)
" Assuming that the VM is still RUNNING (will poll VM).");
//----------------------------------------------------
vmm->trigger(VirtualMachineManager::POLL,vid);
}
vm->unlock();
@ -286,6 +296,9 @@ void LifeCycleManager::deploy_failure_action(int vid)
int cpu,mem,disk;
time_t the_time = time(0);
Nebula& nd = Nebula::instance();
VirtualMachineManager * vmm = nd.get_vmm();
//----------------------------------------------------
// RUNNING STATE FROM MIGRATE
//----------------------------------------------------
@ -332,6 +345,8 @@ void LifeCycleManager::deploy_failure_action(int vid)
" Assuming that the VM is still RUNNING (will poll VM).");
//----------------------------------------------------
vmm->trigger(VirtualMachineManager::POLL,vid);
}
else if (vm->get_lcm_state() == VirtualMachine::BOOT)
{
@ -392,6 +407,9 @@ void LifeCycleManager::shutdown_failure_action(int vid)
{
VirtualMachine * vm;
Nebula& nd = Nebula::instance();
VirtualMachineManager * vmm = nd.get_vmm();
vm = vmpool->get(vid,true);
if ( vm == 0 )
@ -412,6 +430,8 @@ void LifeCycleManager::shutdown_failure_action(int vid)
//----------------------------------------------------
vmm->trigger(VirtualMachineManager::POLL,vid);
vm->unlock();
}
@ -635,6 +655,9 @@ void LifeCycleManager::cancel_failure_action(int vid)
{
VirtualMachine * vm;
Nebula& nd = Nebula::instance();
VirtualMachineManager * vmm = nd.get_vmm();
vm = vmpool->get(vid,true);
if ( vm == 0 )
@ -655,6 +678,8 @@ void LifeCycleManager::cancel_failure_action(int vid)
//----------------------------------------------------
vmm->trigger(VirtualMachineManager::POLL,vid);
vm->unlock();
}