shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

Merge branch 'bug-2645'

Browse Source
This commit is contained in:
Jaime Melis 2014-02-19 22:58:18 +01:00
commit 2a8393b15d
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/LifeCycleManager.h
View File

@ -207,7 +207,7 @@ private:
void attach_success_action(int vid);
void attach_failure_action(int vid);
void attach_failure_action(int vid, bool release_save_as);
void detach_success_action(int vid);

2
src/lcm/LifeCycleManager.cc
View File

@ -356,7 +356,7 @@ void LifeCycleManager::do_action(const string &action, void * arg)
}
else if (action == "ATTACH_FAILURE")
{
attach_failure_action(vid);
attach_failure_action(vid, false);
}
else if (action == "DETACH_SUCCESS")
{

15
src/lcm/LifeCycleStates.cc
View File

@ -1340,7 +1340,7 @@ void LifeCycleManager::attach_success_action(int vid)
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void LifeCycleManager::attach_failure_action(int vid)
void LifeCycleManager::attach_failure_action(int vid, bool release_save_as)
{
VirtualMachine * vm;
VectorAttribute * disk;
@ -1385,6 +1385,17 @@ void LifeCycleManager::attach_failure_action(int vid)
Quotas::quota_del(Quotas::IMAGE, uid, gid, &tmpl);
imagem->release_image(oid, image_id, false);
// Release non-persistent images in the detach event
if (release_save_as)
{
int save_as_id;
if ( disk->vector_value("SAVE_AS", save_as_id) == 0 )
{
imagem->release_image(oid, save_as_id, false);
}
}
}
else // Volatile disk
{
@ -1408,7 +1419,7 @@ void LifeCycleManager::attach_failure_action(int vid)
void LifeCycleManager::detach_success_action(int vid)
{
attach_failure_action(vid);
attach_failure_action(vid, true);
}
/* -------------------------------------------------------------------------- */