1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

B #: fix used after reset bug (#782)

This commit is contained in:
Christian González 2021-02-10 09:43:52 +01:00 committed by GitHub
parent 85a1f98370
commit 85a4988abf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -368,40 +368,40 @@ int ImagePool::acquire_disk(int vm_id,
if (has_size && img->is_persistent() && size != img->get_size())
{
img.reset();
imagem->release_image(vm_id, iid, false);
oss << "SIZE attribute is not supported for persistent image ["
<< img->get_oid() << "].";
error_str = oss.str();
img.reset();
imagem->release_image(vm_id, iid, false);
return -1;
}
if (has_size && img->get_type() == Image::CDROM && size != img->get_size())
{
img.reset();
imagem->release_image(vm_id, iid, false);
oss << "SIZE attribute is not supported for CDROM image ["
<< img->get_oid() << "].";
error_str = oss.str();
img.reset();
imagem->release_image(vm_id, iid, false);
return -1;
}
if (has_size && size < img->get_size())
{
img.reset();
imagem->release_image(vm_id, iid, false);
oss << "SIZE of " << size << "MB is less than the image ["
<< img->get_oid() << "] size of " << img->get_size() << "MB.";
error_str = oss.str();
img.reset();
imagem->release_image(vm_id, iid, false);
return -1;
}