shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-12 21:57:23 +03:00
Code Releases Wiki Activity

Feature #4400: Improve error messages

Browse Source
This commit is contained in:
Carlos Martín 2016-04-21 11:17:47 +02:00
parent f743efba0f
commit ca271935ec
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/image/ImagePool.cc
View File

@ -154,6 +154,7 @@ int ImagePool::allocate (
{
if (imagem->can_clone_image(cloning_id, oss) == -1)
{
error_str = oss.str();
goto error_clone_state;
}

14
src/rm/RequestManagerClone.cc
View File

@ -168,6 +168,7 @@ Request::ErrorCode VMTemplateClone::request_execute(
vector<int> new_img_ids;
vector<int>::iterator i;
RequestAttributes del_att(att);
RequestAttributes img_att(att);
img_att.resp_obj = PoolObjectSQL::IMAGE;
@ -220,10 +221,10 @@ Request::ErrorCode VMTemplateClone::request_execute(
{
NebulaLog::log("ReM", Log::ERROR, failure_message(ec, img_att));
ImageDelete::delete_img(img_id, img_att);
att.resp_msg = "Failure while making the cloned "
"images persistent. "+img_att.resp_msg;
"images persistent. "+failure_message(ec, img_att);
ImageDelete::delete_img(img_id, img_att);
goto error_images;
}
@ -241,7 +242,7 @@ Request::ErrorCode VMTemplateClone::request_execute(
NebulaLog::log("ReM", Log::ERROR, failure_message(ec, img_att));
att.resp_msg = "Failure while cloning the "
"template images. "+img_att.resp_msg;
"template images. "+failure_message(ec, img_att);
goto error_images;
}
@ -270,12 +271,11 @@ Request::ErrorCode VMTemplateClone::request_execute(
return SUCCESS;
error_images:
ec = TemplateDelete::request_execute(new_id, false, att);
ec = TemplateDelete::request_execute(new_id, false, del_att);
if (ec != SUCCESS)
{
NebulaLog::log("ReM", Log::ERROR, failure_message(ec, att));
NebulaLog::log("ReM", Log::ERROR, failure_message(ec, del_att));
}
goto error_template;