shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Bug #3731: Clear the save-as VM disk flag when the target Image is deleted

Browse Source
This commit is contained in:
Carlos Martín 2015-04-23 16:17:58 +02:00
parent 402400053f
commit 6ce059d909
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/rm/RequestManagerDelete.cc
View File

@ -179,12 +179,58 @@ int HostDelete::drop(int oid, PoolObjectSQL * object, string& error_msg)
int ImageDelete::drop(int oid, PoolObjectSQL * object, string& error_msg)
{
Nebula& nd = Nebula::instance();
ImageManager * imagem = nd.get_imagem();
Nebula& nd = Nebula::instance();
ImageManager * imagem = nd.get_imagem();
VirtualMachinePool * vmpool = nd.get_vmpool();
VirtualMachine * vm;
bool save_as;
int rc, img_id, vm_id, disk_id;
object->get_template_attribute("SAVE_AS", save_as);
if (save_as)
{
save_as = save_as && object->get_template_attribute("SAVED_VM_ID", vm_id);
save_as = save_as && object->get_template_attribute("SAVED_DISK_ID", disk_id);
}
object->unlock();
return imagem->delete_image(oid, error_msg);
rc = imagem->delete_image(oid, error_msg);
// -------------------------------------------------------------------------
// Cancel the disk snapshot
// -------------------------------------------------------------------------
if (rc == 0 && save_as)
{
vm = vmpool->get(vm_id, true);
if (vm == 0)
{
return rc;
}
if (vm->get_state() == VirtualMachine::DONE)
{
vm->unlock();
return rc;
}
img_id = vm->get_save_disk_image(disk_id);
if ( img_id == oid )
{
vm->clear_save_disk(disk_id);
vmpool->update(vm);
}
vm->unlock();
}
return rc;
}
/* ------------------------------------------------------------------------- */