database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-3638: Fix level of various storagemanager logging items.

Browse Source
This commit is contained in:
benthompson15
2019-12-03 12:51:48 -06:00
parent 57724e5515
commit bdd87284f9
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage-manager/src/AppendTask.cpp
View File

@@ -90,7 +90,7 @@ bool AppendTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "AppendTask: caught '%s'", e.what()); logger->log(LOG_ERR, "AppendTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/CopyTask.cpp
View File

@@ -70,7 +70,7 @@ bool CopyTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "CopyTask: caught %s", e.what()); logger->log(LOG_ERR, "CopyTask: caught %s", e.what());
err = -1; err = -1;
errno = EIO; errno = EIO;
} }

2
storage-manager/src/ListDirectoryTask.cpp
View File

@@ -99,7 +99,7 @@ bool ListDirectoryTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "ListDirectoryTask: caught '%s'", e.what()); logger->log(LOG_ERR, "ListDirectoryTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/OpenTask.cpp
View File

@@ -75,7 +75,7 @@ bool OpenTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "OpenTask: caught '%s'", e.what()); logger->log(LOG_ERR, "OpenTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/ReadTask.cpp
View File

@@ -85,7 +85,7 @@ bool ReadTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "ReadTask: caught '%s'", e.what()); logger->log(LOG_ERR, "ReadTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

40
storage-manager/src/S3Storage.cpp
View File

@@ -170,7 +170,7 @@ void S3Storage::testConnectivityAndPerms()
err = deleteObject(testObjKey); err = deleteObject(testObjKey);
if (err) if (err)
FAIL(DELETE) 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) 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<uint8_t>
if (err && retryable_error(err)) if (err && retryable_error(err))
{ {
if (ms3_server_error(creds)) 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()); " Retrying...", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str());
else 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()); s3err_msgs[err], bucket.c_str(), sourceKey.c_str());
sleep(5); sleep(5);
} }
@@ -238,10 +238,10 @@ int S3Storage::getObject(const string &_sourceKey, boost::shared_array<uint8_t>
if (err) if (err)
{ {
if (ms3_server_error(creds)) 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()); ms3_server_error(creds), bucket.c_str(), sourceKey.c_str());
else 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()); s3err_msgs[err], bucket.c_str(), sourceKey.c_str());
data->reset(); data->reset();
errno = s3err_to_errno[err]; errno = s3err_to_errno[err];
@@ -317,10 +317,10 @@ int S3Storage::putObject(const boost::shared_array<uint8_t> data, size_t len, co
if (s3err && retryable_error(s3err)) if (s3err && retryable_error(s3err))
{ {
if (ms3_server_error(creds)) 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()); " Retrying...", ms3_server_error(creds), bucket.c_str(), destKey.c_str());
else 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()); " Retrying...", s3err_msgs[s3err], bucket.c_str(), destKey.c_str());
sleep(5); sleep(5);
} }
@@ -328,7 +328,7 @@ int S3Storage::putObject(const boost::shared_array<uint8_t> data, size_t len, co
if (s3err) if (s3err)
{ {
if (ms3_server_error(creds)) 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()); ms3_server_error(creds), bucket.c_str(), destKey.c_str());
else else
logger->log(LOG_ERR, "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.",
@@ -351,10 +351,10 @@ int S3Storage::deleteObject(const string &_key)
if (s3err && s3err != MS3_ERR_NOT_FOUND && retryable_error(s3err)) if (s3err && s3err != MS3_ERR_NOT_FOUND && retryable_error(s3err))
{ {
if (ms3_server_error(creds)) 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()); " Retrying...", ms3_server_error(creds), bucket.c_str(), key.c_str());
else 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()); s3err_msgs[s3err], bucket.c_str(), key.c_str());
sleep(5); sleep(5);
} }
@@ -363,10 +363,10 @@ int S3Storage::deleteObject(const string &_key)
if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND) if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND)
{ {
if (ms3_server_error(creds)) 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()); ms3_server_error(creds), bucket.c_str(), key.c_str());
else 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()); s3err_msgs[s3err], bucket.c_str(), key.c_str());
return -1; return -1;
} }
@@ -386,10 +386,10 @@ int S3Storage::copyObject(const string &_sourceKey, const string &_destKey)
if (s3err && retryable_error(s3err)) if (s3err && retryable_error(s3err))
{ {
if (ms3_server_error(creds)) 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()); "destkey = %s. Retrying...", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str(), destKey.c_str());
else 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()); " destkey = %s. Retrying...", s3err_msgs[s3err], bucket.c_str(), sourceKey.c_str(), destKey.c_str());
sleep(5); 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() // 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) 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()); "destkey = %s.", ms3_server_error(creds), bucket.c_str(), sourceKey.c_str(), destKey.c_str());
else if (s3err != MS3_ERR_NOT_FOUND) 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()); "destkey = %s.", s3err_msgs[s3err], bucket.c_str(), sourceKey.c_str(), destKey.c_str());
errno = s3err_to_errno[s3err]; errno = s3err_to_errno[s3err];
return -1; 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 (s3err && s3err != MS3_ERR_NOT_FOUND && retryable_error(s3err))
{ {
if (ms3_server_error(creds)) 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()); " Retrying...", ms3_server_error(creds), bucket.c_str(), key.c_str());
else 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()); s3err_msgs[s3err], bucket.c_str(), key.c_str());
sleep(5); sleep(5);
} }
@@ -447,10 +447,10 @@ int S3Storage::exists(const string &_key, bool *out)
if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND) if (s3err != 0 && s3err != MS3_ERR_NOT_FOUND)
{ {
if (ms3_server_error(creds)) 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()); ms3_server_error(creds), bucket.c_str(), key.c_str());
else 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()); s3err_msgs[s3err], bucket.c_str(), key.c_str());
errno = s3err_to_errno[s3err]; errno = s3err_to_errno[s3err];
return -1; return -1;

2
storage-manager/src/SessionManager.cpp
View File

@@ -473,7 +473,7 @@ void SessionManager::socketError(int socket)
void SessionManager::shutdownSM(int sig){ void SessionManager::shutdownSM(int sig){
boost::mutex::scoped_lock s(ctrlMutex); boost::mutex::scoped_lock s(ctrlMutex);
SMLogging* logger = SMLogging::get(); SMLogging* logger = SMLogging::get();
logger->log(LOG_INFO,"SessionManager Caught Signal %i",sig); logger->log(LOG_DEBUG,"SessionManager Caught Signal %i",sig);
int err; int err;
uint8_t ctrlCode = SHUTDOWN; uint8_t ctrlCode = SHUTDOWN;
err = ::write(socketCtrl[1], &ctrlCode, 1); err = ::write(socketCtrl[1], &ctrlCode, 1);

2
storage-manager/src/StatTask.cpp
View File

@@ -71,7 +71,7 @@ bool StatTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "StatTask: caught '%s'", e.what()); logger->log(LOG_ERR, "StatTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/TruncateTask.cpp
View File

@@ -67,7 +67,7 @@ bool TruncateTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "TruncateTask: caught '%s'", e.what()); logger->log(LOG_ERR, "TruncateTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/UnlinkTask.cpp
View File

@@ -68,7 +68,7 @@ bool UnlinkTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "UnlinkTask: caught '%s'", e.what()); logger->log(LOG_ERR, "UnlinkTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }

2
storage-manager/src/WriteTask.cpp
View File

@@ -90,7 +90,7 @@ bool WriteTask::run()
} }
catch (exception &e) catch (exception &e)
{ {
logger->log(LOG_DEBUG, "WriteTask: caught '%s'", e.what()); logger->log(LOG_ERR, "WriteTask: caught '%s'", e.what());
errno = EIO; errno = EIO;
err = -1; err = -1;
} }