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

Revert "Feature #3187: Do not clear VM snapshot list"

Browse Source 
This reverts commit 0003725b07f501f7d093a59185f5ce6e3819eccf.
This commit is contained in:
Ruben S. Montero 2014-10-30 16:39:18 +01:00
parent 5550ccf3e4
commit 61f7fe1650
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lcm/LifeCycleActions.cc
View File

@ -284,6 +284,8 @@ void LifeCycleManager::migrate_action(int vid)
vm->set_state(VirtualMachine::BOOT);
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);

18
src/lcm/LifeCycleStates.cc
View File

@ -45,6 +45,8 @@ void LifeCycleManager::save_success_action(int vid)
vm->set_state(VirtualMachine::PROLOG_MIGRATE);
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -84,6 +86,8 @@ void LifeCycleManager::save_success_action(int vid)
// SUSPENDED STATE
//----------------------------------------------------
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -293,6 +297,8 @@ void LifeCycleManager::deploy_success_action(int vid)
vm->set_state(VirtualMachine::RUNNING);
vm->delete_snapshots();
vmpool->update(vm);
vm->log("LCM", Log::INFO, "New VM state is RUNNING");
@ -543,6 +549,8 @@ void LifeCycleManager::shutdown_success_action(int vid)
// POWEROFF STATE
//----------------------------------------------------
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -570,6 +578,8 @@ void LifeCycleManager::shutdown_success_action(int vid)
vm->set_state(VirtualMachine::EPILOG_UNDEPLOY);
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -1030,6 +1040,8 @@ void LifeCycleManager::cancel_success_action(int vid)
vm->set_state(VirtualMachine::EPILOG_UNDEPLOY);
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -1056,6 +1068,8 @@ void LifeCycleManager::cancel_success_action(int vid)
//----------------------------------------------------
map<string, string> empty;
vm->delete_snapshots();
vm->update_info(0, 0, -1, -1, empty);
vmpool->update(vm);
@ -1191,6 +1205,8 @@ void LifeCycleManager::monitor_suspend_action(int vid)
vm->set_resched(false);
vm->delete_snapshots();
map<string, string> empty;
vm->update_info(0, 0, -1, -1, empty);
@ -1281,6 +1297,8 @@ void LifeCycleManager::monitor_poweroff_action(int vid)
Nebula& nd = Nebula::instance();
DispatchManager * dm = nd.get_dm();
vm->delete_snapshots();
vm->update_info(0, 0, -1, -1, empty);
vm->set_resched(false);