From bdd87284f992080f6b0d0d81ce6a1e545e482320 Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Tue, 3 Dec 2019 12:51:48 -0600 Subject: [PATCH] MCOL-3638: Fix level of various storagemanager logging items. --- storage-manager/src/AppendTask.cpp | 2 +- storage-manager/src/CopyTask.cpp | 2 +- storage-manager/src/ListDirectoryTask.cpp | 2 +- storage-manager/src/OpenTask.cpp | 2 +- storage-manager/src/ReadTask.cpp | 2 +- storage-manager/src/S3Storage.cpp | 40 +++++++++++------------ storage-manager/src/SessionManager.cpp | 2 +- storage-manager/src/StatTask.cpp | 2 +- storage-manager/src/TruncateTask.cpp | 2 +- storage-manager/src/UnlinkTask.cpp | 2 +- storage-manager/src/WriteTask.cpp | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/storage-manager/src/AppendTask.cpp b/storage-manager/src/AppendTask.cpp index 449ff697b..f6d5f35cd 100644 --- a/storage-manager/src/AppendTask.cpp +++ b/storage-manager/src/AppendTask.cpp @@ -90,7 +90,7 @@ bool AppendTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "AppendTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "AppendTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/CopyTask.cpp b/storage-manager/src/CopyTask.cpp index 7943d6cbc..ecf0e12d5 100644 --- a/storage-manager/src/CopyTask.cpp +++ b/storage-manager/src/CopyTask.cpp @@ -70,7 +70,7 @@ bool CopyTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "CopyTask: caught %s", e.what()); + logger->log(LOG_ERR, "CopyTask: caught %s", e.what()); err = -1; errno = EIO; } diff --git a/storage-manager/src/ListDirectoryTask.cpp b/storage-manager/src/ListDirectoryTask.cpp index c474868e9..8906794e6 100644 --- a/storage-manager/src/ListDirectoryTask.cpp +++ b/storage-manager/src/ListDirectoryTask.cpp @@ -99,7 +99,7 @@ bool ListDirectoryTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "ListDirectoryTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "ListDirectoryTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/OpenTask.cpp b/storage-manager/src/OpenTask.cpp index e94a8483d..86413c819 100644 --- a/storage-manager/src/OpenTask.cpp +++ b/storage-manager/src/OpenTask.cpp @@ -75,7 +75,7 @@ bool OpenTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "OpenTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "OpenTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/ReadTask.cpp b/storage-manager/src/ReadTask.cpp index 5ce3015d1..34f421ffc 100644 --- a/storage-manager/src/ReadTask.cpp +++ b/storage-manager/src/ReadTask.cpp @@ -85,7 +85,7 @@ bool ReadTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "ReadTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "ReadTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/S3Storage.cpp b/storage-manager/src/S3Storage.cpp index 9a770e2b6..dead77328 100644 --- a/storage-manager/src/S3Storage.cpp +++ b/storage-manager/src/S3Storage.cpp @@ -170,7 +170,7 @@ void S3Storage::testConnectivityAndPerms() err = deleteObject(testObjKey); if (err) FAIL(DELETE) - logger->log(LOG_DEBUG, "S3Storage: S3 connectivity & permissions are OK"); + logger->log(LOG_INFO, "S3Storage: S3 connectivity & permissions are OK"); } int S3Storage::getObject(const string &sourceKey, const string &destFile, size_t *size) @@ -227,10 +227,10 @@ int S3Storage::getObject(const string &_sourceKey, boost::shared_array if (err && retryable_error(err)) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::getObject(): failed to GET, server says '%s'. bucket = %s, key = %s." + logger->log(LOG_ERR, "S3Storage::getObject(): failed to GET, server says '%s'. bucket = %s, key = %s." " Retrying...", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str()); else - logger->log(LOG_WARNING, "S3Storage::getObject(): failed to GET, got '%s'. bucket = %s, key = %s. Retrying...", + logger->log(LOG_ERR, "S3Storage::getObject(): failed to GET, got '%s'. bucket = %s, key = %s. Retrying...", s3err_msgs[err], bucket.c_str(), sourceKey.c_str()); sleep(5); } @@ -238,10 +238,10 @@ int S3Storage::getObject(const string &_sourceKey, boost::shared_array if (err) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::getObject(): failed to GET, server says '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::getObject(): failed to GET, server says '%s'. bucket = %s, key = %s.", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str()); else - logger->log(LOG_WARNING, "S3Storage::getObject(): failed to GET, got '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::getObject(): failed to GET, got '%s'. bucket = %s, key = %s.", s3err_msgs[err], bucket.c_str(), sourceKey.c_str()); data->reset(); errno = s3err_to_errno[err]; @@ -317,10 +317,10 @@ int S3Storage::putObject(const boost::shared_array data, size_t len, co if (s3err && retryable_error(s3err)) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::putObject(): failed to PUT, server says '%s'. bucket = %s, key = %s." + logger->log(LOG_ERR, "S3Storage::putObject(): failed to PUT, server says '%s'. bucket = %s, key = %s." " Retrying...", ms3_server_error(creds), bucket.c_str(), destKey.c_str()); else - logger->log(LOG_WARNING, "S3Storage::putObject(): failed to PUT, got '%s'. bucket = %s, key = %s." + logger->log(LOG_ERR, "S3Storage::putObject(): failed to PUT, got '%s'. bucket = %s, key = %s." " Retrying...", s3err_msgs[s3err], bucket.c_str(), destKey.c_str()); sleep(5); } @@ -328,7 +328,7 @@ int S3Storage::putObject(const boost::shared_array data, size_t len, co if (s3err) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::putObject(): failed to PUT, server says '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::putObject(): failed to PUT, server says '%s'. bucket = %s, key = %s.", ms3_server_error(creds), bucket.c_str(), destKey.c_str()); else logger->log(LOG_ERR, "S3Storage::putObject(): failed to PUT, got '%s'. bucket = %s, key = %s.", @@ -351,10 +351,10 @@ int S3Storage::deleteObject(const string &_key) if (s3err && s3err != MS3_ERR_NOT_FOUND && retryable_error(s3err)) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::deleteObject(): failed to DELETE, server says '%s'. bucket = %s, key = %s." + logger->log(LOG_ERR, "S3Storage::deleteObject(): failed to DELETE, server says '%s'. bucket = %s, key = %s." " Retrying...", ms3_server_error(creds), bucket.c_str(), key.c_str()); else - logger->log(LOG_CRIT, "S3Storage::deleteObject(): failed to DELETE, got '%s'. bucket = %s, key = %s. Retrying...", + logger->log(LOG_ERR, "S3Storage::deleteObject(): failed to DELETE, got '%s'. bucket = %s, key = %s. Retrying...", s3err_msgs[s3err], bucket.c_str(), key.c_str()); sleep(5); } @@ -363,10 +363,10 @@ int S3Storage::deleteObject(const string &_key) if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::deleteObject(): failed to DELETE, server says '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::deleteObject(): failed to DELETE, server says '%s'. bucket = %s, key = %s.", ms3_server_error(creds), bucket.c_str(), key.c_str()); else - logger->log(LOG_CRIT, "S3Storage::deleteObject(): failed to DELETE, got '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::deleteObject(): failed to DELETE, got '%s'. bucket = %s, key = %s.", s3err_msgs[s3err], bucket.c_str(), key.c_str()); return -1; } @@ -386,10 +386,10 @@ int S3Storage::copyObject(const string &_sourceKey, const string &_destKey) if (s3err && retryable_error(s3err)) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::copyObject(): failed to copy, server says '%s'. bucket = %s, srckey = %s, " + logger->log(LOG_ERR, "S3Storage::copyObject(): failed to copy, server says '%s'. bucket = %s, srckey = %s, " "destkey = %s. Retrying...", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str(), destKey.c_str()); else - logger->log(LOG_CRIT, "S3Storage::copyObject(): failed to copy, got '%s'. bucket = %s, srckey = %s, " + logger->log(LOG_ERR, "S3Storage::copyObject(): failed to copy, got '%s'. bucket = %s, srckey = %s, " " destkey = %s. Retrying...", s3err_msgs[s3err], bucket.c_str(), sourceKey.c_str(), destKey.c_str()); sleep(5); } @@ -399,10 +399,10 @@ int S3Storage::copyObject(const string &_sourceKey, const string &_destKey) { // added the add'l check MS3_ERR_NOT_FOUND to suppress error msgs for a legitimate case in IOC::copyFile() if (ms3_server_error(creds) && s3err != MS3_ERR_NOT_FOUND) - logger->log(LOG_WARNING, "S3Storage::copyObject(): failed to copy, server says '%s'. bucket = %s, srckey = %s, " + logger->log(LOG_ERR, "S3Storage::copyObject(): failed to copy, server says '%s'. bucket = %s, srckey = %s, " "destkey = %s.", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str(), destKey.c_str()); else if (s3err != MS3_ERR_NOT_FOUND) - logger->log(LOG_CRIT, "S3Storage::copyObject(): failed to copy, got '%s'. bucket = %s, srckey = %s, " + logger->log(LOG_ERR, "S3Storage::copyObject(): failed to copy, got '%s'. bucket = %s, srckey = %s, " "destkey = %s.", s3err_msgs[s3err], bucket.c_str(), sourceKey.c_str(), destKey.c_str()); errno = s3err_to_errno[s3err]; return -1; @@ -435,10 +435,10 @@ int S3Storage::exists(const string &_key, bool *out) if (s3err && s3err != MS3_ERR_NOT_FOUND && retryable_error(s3err)) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::exists(): failed to HEAD, server says '%s'. bucket = %s, key = %s." + logger->log(LOG_ERR, "S3Storage::exists(): failed to HEAD, server says '%s'. bucket = %s, key = %s." " Retrying...", ms3_server_error(creds), bucket.c_str(), key.c_str()); else - logger->log(LOG_CRIT, "S3Storage::exists(): failed to HEAD, got '%s'. bucket = %s, key = %s. Retrying...", + logger->log(LOG_ERR, "S3Storage::exists(): failed to HEAD, got '%s'. bucket = %s, key = %s. Retrying...", s3err_msgs[s3err], bucket.c_str(), key.c_str()); sleep(5); } @@ -447,10 +447,10 @@ int S3Storage::exists(const string &_key, bool *out) if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND) { if (ms3_server_error(creds)) - logger->log(LOG_WARNING, "S3Storage::exists(): failed to HEAD, server says '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::exists(): failed to HEAD, server says '%s'. bucket = %s, key = %s.", ms3_server_error(creds), bucket.c_str(), key.c_str()); else - logger->log(LOG_CRIT, "S3Storage::exists(): failed to HEAD, got '%s'. bucket = %s, key = %s.", + logger->log(LOG_ERR, "S3Storage::exists(): failed to HEAD, got '%s'. bucket = %s, key = %s.", s3err_msgs[s3err], bucket.c_str(), key.c_str()); errno = s3err_to_errno[s3err]; return -1; diff --git a/storage-manager/src/SessionManager.cpp b/storage-manager/src/SessionManager.cpp index 1c21d9229..4e5096b84 100644 --- a/storage-manager/src/SessionManager.cpp +++ b/storage-manager/src/SessionManager.cpp @@ -473,7 +473,7 @@ void SessionManager::socketError(int socket) void SessionManager::shutdownSM(int sig){ boost::mutex::scoped_lock s(ctrlMutex); SMLogging* logger = SMLogging::get(); - logger->log(LOG_INFO,"SessionManager Caught Signal %i",sig); + logger->log(LOG_DEBUG,"SessionManager Caught Signal %i",sig); int err; uint8_t ctrlCode = SHUTDOWN; err = ::write(socketCtrl[1], &ctrlCode, 1); diff --git a/storage-manager/src/StatTask.cpp b/storage-manager/src/StatTask.cpp index 827189964..3990e6081 100644 --- a/storage-manager/src/StatTask.cpp +++ b/storage-manager/src/StatTask.cpp @@ -71,7 +71,7 @@ bool StatTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "StatTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "StatTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/TruncateTask.cpp b/storage-manager/src/TruncateTask.cpp index e76975133..a032b12ef 100644 --- a/storage-manager/src/TruncateTask.cpp +++ b/storage-manager/src/TruncateTask.cpp @@ -67,7 +67,7 @@ bool TruncateTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "TruncateTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "TruncateTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/UnlinkTask.cpp b/storage-manager/src/UnlinkTask.cpp index ccb777a47..a5267831a 100644 --- a/storage-manager/src/UnlinkTask.cpp +++ b/storage-manager/src/UnlinkTask.cpp @@ -68,7 +68,7 @@ bool UnlinkTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "UnlinkTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "UnlinkTask: caught '%s'", e.what()); errno = EIO; err = -1; } diff --git a/storage-manager/src/WriteTask.cpp b/storage-manager/src/WriteTask.cpp index 189acc4b9..fc7c3fce5 100644 --- a/storage-manager/src/WriteTask.cpp +++ b/storage-manager/src/WriteTask.cpp @@ -90,7 +90,7 @@ bool WriteTask::run() } catch (exception &e) { - logger->log(LOG_DEBUG, "WriteTask: caught '%s'", e.what()); + logger->log(LOG_ERR, "WriteTask: caught '%s'", e.what()); errno = EIO; err = -1; }