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

feautr #1631: Renamed to life-migrate.

Browse Source
This commit is contained in:
Ruben S. Montero 2013-04-04 23:17:55 +02:00
parent 68e48b0d1f
commit 5e16073479
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/History.h
View File

@ -70,7 +70,7 @@ public:
st = "migrate";
break;
case LIVE_MIGRATE_ACTION:
st = "migrate-live";
st = "live-migrate";
break;
case SHUTDOWN_ACTION:
st = "shutdown";
@ -140,7 +140,7 @@ public:
{
action = MIGRATE_ACTION;
}
else if (st == "migrate-live")
else if (st == "live-migrate")
{
action = LIVE_MIGRATE_ACTION;
}

6
include/VirtualMachine.h
View File

@ -509,7 +509,7 @@ public:
* Returns the action that closed the history record in the previous host
* @return the action that closed the history record in the previous host
*/
const History::VMAction get_previous_history_action() const
const History::VMAction get_previous_action() const
{
return previous_history->action;
};
@ -660,7 +660,7 @@ public:
* Sets the action that closed the history record
* @param action that closed the history record
*/
void set_history_action(History::VMAction action)
void set_action(History::VMAction action)
{
history->action = action;
};
@ -669,7 +669,7 @@ public:
* Sets the action that closed the history record in the previous host
* @param action that closed the history record in the previous host
*/
void set_previous_history_action(History::VMAction action)
void set_previous_action(History::VMAction action)
{
previous_history->action = action;
};

31
src/lcm/LifeCycleActions.cc
View File

@ -48,14 +48,13 @@ void LifeCycleManager::deploy_action(int vid)
if (vm->hasPreviousHistory())
{
if (vm->get_previous_history_action() == History::STOP_ACTION)
if (vm->get_previous_action() == History::STOP_ACTION)
{
vm_state = VirtualMachine::PROLOG_RESUME;
tm_action = TransferManager::PROLOG_RESUME;
}
else if (
vm->get_previous_history_action() == History::UNDEPLOY_ACTION ||
vm->get_previous_history_action() == History::UNDEPLOY_HARD_ACTION)
else if (vm->get_previous_action() == History::UNDEPLOY_ACTION ||
vm->get_previous_action() == History::UNDEPLOY_HARD_ACTION)
{
vm_state = VirtualMachine::PROLOG_UNDEPLOY;
tm_action = TransferManager::PROLOG_RESUME;
@ -122,7 +121,7 @@ void LifeCycleManager::suspend_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::SUSPEND_ACTION);
vm->set_action(History::SUSPEND_ACTION);
vmpool->update_history(vm);
@ -172,7 +171,7 @@ void LifeCycleManager::stop_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::STOP_ACTION);
vm->set_action(History::STOP_ACTION);
vmpool->update_history(vm);
@ -225,7 +224,7 @@ void LifeCycleManager::migrate_action(int vid)
vm->set_stime(time(0));
vm->set_previous_history_action(History::MIGRATE_ACTION);
vm->set_previous_action(History::MIGRATE_ACTION);
vmpool->update_history(vm);
@ -283,7 +282,7 @@ void LifeCycleManager::live_migrate_action(int vid)
vm->set_stime(time(0));
vm->set_history_action(History::LIVE_MIGRATE_ACTION);
vm->set_action(History::LIVE_MIGRATE_ACTION);
vmpool->update_history(vm);
@ -337,7 +336,7 @@ void LifeCycleManager::shutdown_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::SHUTDOWN_ACTION);
vm->set_action(History::SHUTDOWN_ACTION);
vmpool->update_history(vm);
@ -393,13 +392,13 @@ void LifeCycleManager::undeploy_action(int vid, bool hard)
if (hard)
{
vm->set_history_action(History::UNDEPLOY_HARD_ACTION);
vm->set_action(History::UNDEPLOY_HARD_ACTION);
vmm->trigger(VirtualMachineManager::CANCEL,vid);
}
else
{
vm->set_history_action(History::UNDEPLOY_ACTION);
vm->set_action(History::UNDEPLOY_ACTION);
vmm->trigger(VirtualMachineManager::SHUTDOWN,vid);
}
@ -469,13 +468,13 @@ void LifeCycleManager::poweroff_action(int vid, bool hard)
if (hard)
{
vm->set_history_action(History::POWEROFF_HARD_ACTION);
vm->set_action(History::POWEROFF_HARD_ACTION);
vmm->trigger(VirtualMachineManager::CANCEL,vid);
}
else
{
vm->set_history_action(History::POWEROFF_ACTION);
vm->set_action(History::POWEROFF_ACTION);
vmm->trigger(VirtualMachineManager::SHUTDOWN,vid);
}
@ -578,7 +577,7 @@ void LifeCycleManager::cancel_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::SHUTDOWN_HARD_ACTION);
vm->set_action(History::SHUTDOWN_HARD_ACTION);
vmpool->update_history(vm);
@ -843,12 +842,12 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
if (dispose)
{
vm->set_state(VirtualMachine::CLEANUP_DELETE);
vm->set_history_action(History::DESTROY_ACTION);
vm->set_action(History::DESTROY_ACTION);
}
else
{
vm->set_state(VirtualMachine::CLEANUP_RESUBMIT);
vm->set_history_action(History::DESTROY_RECREATE_ACTION);
vm->set_action(History::DESTROY_RECREATE_ACTION);
}
vm->set_resched(false);

6
src/lcm/LifeCycleStates.cc
View File

@ -222,7 +222,7 @@ void LifeCycleManager::save_failure_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::NONE_ACTION);
vm->set_action(History::NONE_ACTION);
vmpool->update_history(vm);
@ -581,7 +581,7 @@ void LifeCycleManager::shutdown_failure_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::NONE_ACTION);
vm->set_action(History::NONE_ACTION);
vmpool->update_history(vm);
@ -1055,7 +1055,7 @@ void LifeCycleManager::cancel_failure_action(int vid)
vmpool->update(vm);
vm->set_history_action(History::NONE_ACTION);
vm->set_action(History::NONE_ACTION);
vmpool->update_history(vm);