shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

F #937: Do not release image if other disk uses it (#2262)

Browse Source
This commit is contained in:
Pavel Czerný 2022-08-25 10:19:35 +02:00 committed by GitHub
parent 83b2aff7d4
commit 015d842467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vm/VirtualMachinePool.cc
View File

@ -998,18 +998,27 @@ void VirtualMachinePool::delete_attach_disk(std::unique_ptr<VirtualMachine> vm)
update(vm.get());
vm.reset();
if ( disk == nullptr )
{
return;
}
// skip image release if there is other disk using the same image
int image_id;
set<int> image_ids;
disk->vector_value("IMAGE_ID", image_id);
vm->get_disks().get_image_ids(image_ids, uid);
bool do_image_release = image_ids.count(image_id) == 0;
vm.reset();
Nebula& nd = Nebula::instance();
ImageManager* imagem = nd.get_imagem();
Template tmpl;
int image_id;
tmpl.set(disk->vector_attribute());
tmpl.add("VMS", 0);
@ -1020,8 +1029,6 @@ void VirtualMachinePool::delete_attach_disk(std::unique_ptr<VirtualMachine> vm)
}
else
{
disk->vector_value("IMAGE_ID", image_id);
Quotas::quota_del(Quotas::IMAGE, uid, gid, &tmpl);
if (!disk->is_persistent())
@ -1040,7 +1047,10 @@ void VirtualMachinePool::delete_attach_disk(std::unique_ptr<VirtualMachine> vm)
imagem->clear_image_snapshots(image_id);
}
imagem->release_image(oid, image_id, false);
if (do_image_release)
{
imagem->release_image(oid, image_id, false);
}
}
delete disk;