shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-28 07:21:29 +03:00
Code Releases Wiki Activity

Bug #3911: Fix for VMs stuck in hotplug state

Browse Source
This commit is contained in:
Carlos Martín 2015-08-27 18:20:42 +02:00
parent 05ed37c97f
commit 4bd8e56b85
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/image/ImageManagerActions.cc
View File

@ -379,6 +379,7 @@ int ImageManager::delete_image(int iid, string& error_str)
int uid;
int gid;
int cloning_id = -1;
int vm_saving_id = -1;
ostringstream oss;
@ -452,6 +453,11 @@ int ImageManager::delete_image(int iid, string& error_str)
case Image::LOCKED:
cloning_id = img->get_cloning_id();
if ( img->is_saving() )
{
img->get_template_attribute("SAVED_VM_ID", vm_saving_id);
}
break;
}
@ -530,6 +536,28 @@ int ImageManager::delete_image(int iid, string& error_str)
ds->unlock();
}
/* --------------- Release VM in hotplug -------------------------------- */
// This is only needed if the image is deleted before the mkfs action
// is completed
if ( vm_saving_id != -1 )
{
VirtualMachine* vm;
VirtualMachinePool* vmpool = Nebula::instance().get_vmpool();
if ((vm = vmpool->get(vm_saving_id, true)) != 0)
{
vm->clear_saveas_state();
vm->clear_saveas_disk();
vmpool->update(vm);
vm->unlock();
}
}
return 0;
}