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

F #727: Fix build (#924)

Browse Source
This commit is contained in:
Pavel Czerný 2021-03-08 11:30:38 +01:00 committed by GitHub
parent 98f5e68676
commit 64255de853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/image/ImageManagerActions.cc
View File

@ -93,7 +93,7 @@ int ImageManager::acquire_image(int vm_id, Image *img, bool attach, string& erro
string persistent_type;
ostringstream oss;
switch(img->get_type())
{
case Image::OS:
@ -111,11 +111,11 @@ int ImageManager::acquire_image(int vm_id, Image *img, bool attach, string& erro
error = oss.str();
return -1;
}
img->get_template_attribute("PERSISTENT_TYPE", persistent_type);
shareable = one_util::toupper(persistent_type) == "SHAREABLE";
switch (img->get_state())
{
case Image::READY:
@ -250,33 +250,37 @@ void ImageManager::release_image(int vm_id, int iid, bool failed)
switch (img->get_state())
{
case Image::USED_PERS:
int num_vms = img->dec_running(vm_id);
if (failed)
{
img->set_state(Image::ERROR);
}
else if (num_vms == 0)
{
img->set_state(Image::READY);
}
int num_vms = img->dec_running(vm_id);
ipool->update(img.get());
if (failed)
{
img->set_state(Image::ERROR);
}
else if (num_vms == 0)
{
img->set_state(Image::READY);
}
ipool->update(img.get());
}
break;
case Image::LOCKED_USED_PERS:
int num_vms = img->dec_running(vm_id);
if (failed)
{
img->set_state(Image::ERROR);
}
else if (num_vms == 0)
{
img->set_state(Image::LOCKED);
}
int num_vms = img->dec_running(vm_id);
ipool->update(img.get());
if (failed)
{
img->set_state(Image::ERROR);
}
else if (num_vms == 0)
{
img->set_state(Image::LOCKED);
}
ipool->update(img.get());
}
break;
case Image::USED: