From 5a67956e684a5184d340bb27aaf7e5dff2668928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 24 Jan 2012 09:20:37 -0800 Subject: [PATCH] Bug #1083: Better handling of RM FAILURE in ImageManagerDriver (cherry picked from commit 8c348ca259e90c953e07a5101c499e6c1b1ea98e) --- src/image/ImageManagerDriver.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc index c565209491..7c1862fb65 100644 --- a/src/image/ImageManagerDriver.cc +++ b/src/image/ImageManagerDriver.cc @@ -228,13 +228,12 @@ void ImageManagerDriver::protocol( if ( rc < 0 ) { - image->unlock(); NebulaLog::log("ImM",Log::ERROR,"Image could not be removed from DB"); } if ( result == "SUCCESS" ) { - NebulaLog::log("ImM",Log::ERROR,"Image successfully removed."); + NebulaLog::log("ImM",Log::INFO,"Image successfully removed."); } else { @@ -267,10 +266,23 @@ error_mkfs: goto error_common; error_rm: + image->unlock(); + os.str(""); os << "Error removing image from repository. Remove file " << source << " to completely delete image."; + getline(is,info); + + if (!info.empty() && (info[0] != '-')) + { + os << ": " << info; + } + + NebulaLog::log("ImM", Log::ERROR, os); + + return; + error_common: getline(is,info);