From ca271935ec5dcf06d2f63b98bbf1071d5dcae586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 21 Apr 2016 11:17:47 +0200 Subject: [PATCH] Feature #4400: Improve error messages --- src/image/ImagePool.cc | 1 + src/rm/RequestManagerClone.cc | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc index 67b6756db4..486c31a9a5 100644 --- a/src/image/ImagePool.cc +++ b/src/image/ImagePool.cc @@ -154,6 +154,7 @@ int ImagePool::allocate ( { if (imagem->can_clone_image(cloning_id, oss) == -1) { + error_str = oss.str(); goto error_clone_state; } diff --git a/src/rm/RequestManagerClone.cc b/src/rm/RequestManagerClone.cc index 87e7e9ba7a..3f596ca882 100644 --- a/src/rm/RequestManagerClone.cc +++ b/src/rm/RequestManagerClone.cc @@ -168,6 +168,7 @@ Request::ErrorCode VMTemplateClone::request_execute( vector new_img_ids; vector::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;