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

Bug #1595: Fix bug in image clone release process

Browse Source
This commit is contained in:
Carlos Martín 2012-10-31 17:13:28 +01:00
parent 0c8e01b7aa
commit c2eec65475
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/image/ImageManagerActions.cc
View File

@ -417,6 +417,8 @@ int ImageManager::delete_image(int iid, const string& ds_data)
imd->rm(img->get_oid(), *drv_msg);
img->set_state(Image::DELETE);
img->clear_cloning_id();
ipool->update(img);
}

8
src/image/ImageManagerDriver.cc
View File

@ -271,10 +271,10 @@ static void clone_action(istringstream& is,
image->set_state(Image::READY);
ipool->update(image);
image->clear_cloning_id();
ipool->update(image);
image->unlock();
NebulaLog::log("ImM", Log::INFO, "Image cloned and ready to use.");
@ -284,7 +284,7 @@ static void clone_action(istringstream& is,
return;
error:
oss << "Error cloning image ";
oss << "Error cloning from Image " << cloning_id;
getline(is, info);
@ -298,6 +298,8 @@ error:
image->set_template_error_message(oss.str());
image->set_state(Image::ERROR);
image->clear_cloning_id();
ipool->update(image);
image->unlock();