From b301b804917261f94528e4becaecd48c262c1604 Mon Sep 17 00:00:00 2001 From: Igor Gaponenko Date: Tue, 1 Aug 2023 21:38:29 +0000 Subject: [PATCH] Reduced logging level in the worker request classes --- src/xrdreq/ChunkGroupQservRequest.cc | 6 +++--- src/xrdreq/ChunkListQservRequest.cc | 10 +++++----- src/xrdreq/GetChunkListQservRequest.cc | 8 ++++---- src/xrdreq/GetDbStatusQservRequest.cc | 4 ++-- src/xrdreq/GetStatusQservRequest.cc | 4 ++-- src/xrdreq/QservRequest.cc | 12 ++++++------ src/xrdreq/QueryManagementAction.cc | 4 ++-- src/xrdreq/QueryManagementRequest.cc | 4 ++-- src/xrdreq/SetChunkListQservRequest.cc | 8 ++++---- src/xrdreq/TestEchoQservRequest.cc | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/xrdreq/ChunkGroupQservRequest.cc b/src/xrdreq/ChunkGroupQservRequest.cc index e72ff5cce..0ded683e6 100644 --- a/src/xrdreq/ChunkGroupQservRequest.cc +++ b/src/xrdreq/ChunkGroupQservRequest.cc @@ -40,12 +40,12 @@ namespace lsst::qserv::xrdreq { ChunkGroupQservRequest::ChunkGroupQservRequest(bool add, unsigned int chunk, vector const& databases, bool force, CallbackType onFinish) : _add(add), _chunk(chunk), _databases(databases), _force(force), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, "ChunkGroupQservRequest[" << (_add ? "add" : "remove") << "] ** CONSTRUCTED **"); } ChunkGroupQservRequest::~ChunkGroupQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "ChunkGroupQservRequest[" << (_add ? "add" : "remove") << "] ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "ChunkGroupQservRequest[" << (_add ? "add" : "remove") << "] ** DELETED **"); } void ChunkGroupQservRequest::onRequest(proto::FrameBuffer& buf) { @@ -67,7 +67,7 @@ void ChunkGroupQservRequest::onResponse(proto::FrameBufferView& view) { proto::WorkerCommandChunkGroupR reply; view.parse(reply); - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, "ChunkGroupQservRequest[" << (_add ? "add" : "remove") << "** SERVICE REPLY ** status: " << proto::WorkerCommandStatus_Code_Name(reply.status().code())); diff --git a/src/xrdreq/ChunkListQservRequest.cc b/src/xrdreq/ChunkListQservRequest.cc index 7d4c64128..839b9d25b 100644 --- a/src/xrdreq/ChunkListQservRequest.cc +++ b/src/xrdreq/ChunkListQservRequest.cc @@ -39,11 +39,11 @@ namespace lsst::qserv::xrdreq { ChunkListQservRequest::ChunkListQservRequest(bool rebuild, bool reload, CallbackType onFinish) : _rebuild(rebuild), _reload(reload), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "ChunkListQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "ChunkListQservRequest ** CONSTRUCTED **"); } ChunkListQservRequest::~ChunkListQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "ChunkListQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "ChunkListQservRequest ** DELETED **"); } void ChunkListQservRequest::onRequest(proto::FrameBuffer& buf) { @@ -63,7 +63,7 @@ void ChunkListQservRequest::onResponse(proto::FrameBufferView& view) { proto::WorkerCommandUpdateChunkListR reply; view.parse(reply); - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, context << "** SERVICE REPLY ** status: " << proto::WorkerCommandStatus_Code_Name(reply.status().code())); @@ -77,7 +77,7 @@ void ChunkListQservRequest::onResponse(proto::FrameBufferView& view) { Chunk chunk{chunkEntry.chunk(), chunkEntry.db()}; added.push_back(chunk); } - LOGS(_log, LOG_LVL_DEBUG, context << "total chunks added: " << numAdded); + LOGS(_log, LOG_LVL_TRACE, context << "total chunks added: " << numAdded); int const numRemoved = reply.removed_size(); for (int i = 0; i < numRemoved; i++) { @@ -85,7 +85,7 @@ void ChunkListQservRequest::onResponse(proto::FrameBufferView& view) { Chunk chunk{chunkEntry.chunk(), chunkEntry.db()}; removed.push_back(chunk); } - LOGS(_log, LOG_LVL_DEBUG, context << "total chunks removed: " << numRemoved); + LOGS(_log, LOG_LVL_TRACE, context << "total chunks removed: " << numRemoved); } if (nullptr != _onFinish) { // Clearing the stored callback after finishing the up-stream notification diff --git a/src/xrdreq/GetChunkListQservRequest.cc b/src/xrdreq/GetChunkListQservRequest.cc index 686151b98..2d152e03b 100644 --- a/src/xrdreq/GetChunkListQservRequest.cc +++ b/src/xrdreq/GetChunkListQservRequest.cc @@ -47,11 +47,11 @@ GetChunkListQservRequest::Ptr GetChunkListQservRequest::create( GetChunkListQservRequest::GetChunkListQservRequest(bool inUseOnly, GetChunkListQservRequest::CallbackType onFinish) : _inUseOnly(inUseOnly), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "GetChunkListQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "GetChunkListQservRequest ** CONSTRUCTED **"); } GetChunkListQservRequest::~GetChunkListQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "GetChunkListQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "GetChunkListQservRequest ** DELETED **"); } void GetChunkListQservRequest::onRequest(proto::FrameBuffer& buf) { @@ -66,7 +66,7 @@ void GetChunkListQservRequest::onResponse(proto::FrameBufferView& view) { proto::WorkerCommandGetChunkListR reply; view.parse(reply); - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, context << "** SERVICE REPLY ** status: " << proto::WorkerCommandStatus_Code_Name(reply.status().code())); @@ -80,7 +80,7 @@ void GetChunkListQservRequest::onResponse(proto::FrameBufferView& view) { Chunk chunk{chunkEntry.chunk(), chunkEntry.db(), chunkEntry.use_count()}; chunks.push_back(chunk); } - LOGS(_log, LOG_LVL_DEBUG, context << "total chunks: " << num); + LOGS(_log, LOG_LVL_TRACE, context << "total chunks: " << num); } if (nullptr != _onFinish) { // Clearing the stored callback after finishing the up-stream notification diff --git a/src/xrdreq/GetDbStatusQservRequest.cc b/src/xrdreq/GetDbStatusQservRequest.cc index f781dc6cd..24e154594 100644 --- a/src/xrdreq/GetDbStatusQservRequest.cc +++ b/src/xrdreq/GetDbStatusQservRequest.cc @@ -44,11 +44,11 @@ GetDbStatusQservRequest::Ptr GetDbStatusQservRequest::create(GetDbStatusQservReq GetDbStatusQservRequest::GetDbStatusQservRequest(GetDbStatusQservRequest::CallbackType onFinish) : _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "GetDbStatusQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "GetDbStatusQservRequest ** CONSTRUCTED **"); } GetDbStatusQservRequest::~GetDbStatusQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "GetDbStatusQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "GetDbStatusQservRequest ** DELETED **"); } void GetDbStatusQservRequest::onRequest(proto::FrameBuffer& buf) { diff --git a/src/xrdreq/GetStatusQservRequest.cc b/src/xrdreq/GetStatusQservRequest.cc index 84f36baa9..930a7beb4 100644 --- a/src/xrdreq/GetStatusQservRequest.cc +++ b/src/xrdreq/GetStatusQservRequest.cc @@ -44,11 +44,11 @@ GetStatusQservRequest::Ptr GetStatusQservRequest::create(wbase::TaskSelector con GetStatusQservRequest::GetStatusQservRequest(wbase::TaskSelector const& taskSelector, GetStatusQservRequest::CallbackType onFinish) : _taskSelector(taskSelector), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "GetStatusQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "GetStatusQservRequest ** CONSTRUCTED **"); } GetStatusQservRequest::~GetStatusQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "GetStatusQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "GetStatusQservRequest ** DELETED **"); } void GetStatusQservRequest::onRequest(proto::FrameBuffer& buf) { diff --git a/src/xrdreq/QservRequest.cc b/src/xrdreq/QservRequest.cc index 6b038dc69..6310d1c09 100644 --- a/src/xrdreq/QservRequest.cc +++ b/src/xrdreq/QservRequest.cc @@ -49,7 +49,7 @@ QservRequest::~QservRequest() { delete[] _buf; --_numClassInstances; - LOGS(_log, LOG_LVL_DEBUG, "QservRequest destructed instances: " << _numClassInstances); + LOGS(_log, LOG_LVL_TRACE, "QservRequest destructed instances: " << _numClassInstances); } QservRequest::QservRequest() @@ -60,7 +60,7 @@ QservRequest::QservRequest() // This report is used solely for debugging purposes to allow tracking // potential memory leaks within applications. ++_numClassInstances; - LOGS(_log, LOG_LVL_DEBUG, "QservRequest constructed instances: " << _numClassInstances); + LOGS(_log, LOG_LVL_TRACE, "QservRequest constructed instances: " << _numClassInstances); } void QservRequest::cancel() { @@ -113,7 +113,7 @@ bool QservRequest::ProcessResponse(const XrdSsiErrInfo& eInfo, const XrdSsiRespI onError(errorStr); return false; } - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, context << " eInfo.rType: " << rInfo.rType << "(" << rInfo.State() << ")" << ", eInfo.blen: " << rInfo.blen); @@ -121,7 +121,7 @@ bool QservRequest::ProcessResponse(const XrdSsiErrInfo& eInfo, const XrdSsiRespI case XrdSsiRespInfo::isData: case XrdSsiRespInfo::isStream: - LOGS(_log, LOG_LVL_DEBUG, context << "** REQUESTING RESPONSE DATA **"); + LOGS(_log, LOG_LVL_TRACE, context << "** REQUESTING RESPONSE DATA **"); GetResponseData(_buf + _bufSize, _bufIncrementSize); return true; @@ -149,7 +149,7 @@ bool QservRequest::ProcessResponse(const XrdSsiErrInfo& eInfo, const XrdSsiRespI void QservRequest::ProcessResponseData(const XrdSsiErrInfo& eInfo, char* buff, int blen, bool last) { string const context = "QservRequest::" + string(__func__) + " "; - LOGS(_log, LOG_LVL_DEBUG, context << "eInfo.isOK: " << eInfo.isOK()); + LOGS(_log, LOG_LVL_TRACE, context << "eInfo.isOK: " << eInfo.isOK()); if (not eInfo.isOK()) { // This will decrement the reference counter to the pointee at the end of the current @@ -175,7 +175,7 @@ void QservRequest::ProcessResponseData(const XrdSsiErrInfo& eInfo, char* buff, i onError(errorStr); } else { - LOGS(_log, LOG_LVL_DEBUG, context << "blen: " << blen << ", last: " << last); + LOGS(_log, LOG_LVL_TRACE, context << "blen: " << blen << ", last: " << last); // Update the byte counter _bufSize += blen; diff --git a/src/xrdreq/QueryManagementAction.cc b/src/xrdreq/QueryManagementAction.cc index 9882c74da..18dcb11df 100644 --- a/src/xrdreq/QueryManagementAction.cc +++ b/src/xrdreq/QueryManagementAction.cc @@ -70,11 +70,11 @@ void QueryManagementAction::notifyAllWorkers(string const& xrootdFrontendUrl, } QueryManagementAction::QueryManagementAction() { - LOGS(_log, LOG_LVL_DEBUG, "QueryManagementAction ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "QueryManagementAction ** CONSTRUCTED **"); } QueryManagementAction::~QueryManagementAction() { - LOGS(_log, LOG_LVL_DEBUG, "QueryManagementAction ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "QueryManagementAction ** DELETED **"); } void QueryManagementAction::_notifyAllWorkers(std::string const& xrootdFrontendUrl, diff --git a/src/xrdreq/QueryManagementRequest.cc b/src/xrdreq/QueryManagementRequest.cc index 0122c7cb9..ea2c001ce 100644 --- a/src/xrdreq/QueryManagementRequest.cc +++ b/src/xrdreq/QueryManagementRequest.cc @@ -45,11 +45,11 @@ QueryManagementRequest::Ptr QueryManagementRequest::create(proto::QueryManagemen QueryManagementRequest::QueryManagementRequest(proto::QueryManagement::Operation op, QueryId queryId, QueryManagementRequest::CallbackType onFinish) : _op(op), _queryId(queryId), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "QueryManagementRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "QueryManagementRequest ** CONSTRUCTED **"); } QueryManagementRequest::~QueryManagementRequest() { - LOGS(_log, LOG_LVL_DEBUG, "QueryManagementRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "QueryManagementRequest ** DELETED **"); } void QueryManagementRequest::onRequest(proto::FrameBuffer& buf) { diff --git a/src/xrdreq/SetChunkListQservRequest.cc b/src/xrdreq/SetChunkListQservRequest.cc index 23ab3226e..bb3e701a9 100644 --- a/src/xrdreq/SetChunkListQservRequest.cc +++ b/src/xrdreq/SetChunkListQservRequest.cc @@ -49,11 +49,11 @@ SetChunkListQservRequest::SetChunkListQservRequest(SetChunkListQservRequest::Chu vector const& databases, bool force, SetChunkListQservRequest::CallbackType onFinish) : _chunks(chunks), _databases(databases), _force(force), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "SetChunkListQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "SetChunkListQservRequest ** CONSTRUCTED **"); } SetChunkListQservRequest::~SetChunkListQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "SetChunkListQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "SetChunkListQservRequest ** DELETED **"); } void SetChunkListQservRequest::onRequest(proto::FrameBuffer& buf) { @@ -80,7 +80,7 @@ void SetChunkListQservRequest::onResponse(proto::FrameBufferView& view) { proto::WorkerCommandSetChunkListR reply; view.parse(reply); - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, context << "** SERVICE REPLY ** status: " << proto::WorkerCommandStatus_Code_Name(reply.status().code())); @@ -93,7 +93,7 @@ void SetChunkListQservRequest::onResponse(proto::FrameBufferView& view) { Chunk chunk{chunkEntry.chunk(), chunkEntry.db(), chunkEntry.use_count()}; chunks.push_back(chunk); } - LOGS(_log, LOG_LVL_DEBUG, context << "total chunks: " << num); + LOGS(_log, LOG_LVL_TRACE, context << "total chunks: " << num); } if (nullptr != _onFinish) { // Clearing the stored callback after finishing the up-stream notification diff --git a/src/xrdreq/TestEchoQservRequest.cc b/src/xrdreq/TestEchoQservRequest.cc index ed17a5dd0..2864c2741 100644 --- a/src/xrdreq/TestEchoQservRequest.cc +++ b/src/xrdreq/TestEchoQservRequest.cc @@ -46,11 +46,11 @@ TestEchoQservRequest::Ptr TestEchoQservRequest::create(string const& value, TestEchoQservRequest::TestEchoQservRequest(string const& value, TestEchoQservRequest::CallbackType onFinish) : _value(value), _onFinish(onFinish) { - LOGS(_log, LOG_LVL_DEBUG, "TestEchoQservRequest ** CONSTRUCTED **"); + LOGS(_log, LOG_LVL_TRACE, "TestEchoQservRequest ** CONSTRUCTED **"); } TestEchoQservRequest::~TestEchoQservRequest() { - LOGS(_log, LOG_LVL_DEBUG, "TestEchoQservRequest ** DELETED **"); + LOGS(_log, LOG_LVL_TRACE, "TestEchoQservRequest ** DELETED **"); } void TestEchoQservRequest::onRequest(proto::FrameBuffer& buf) { @@ -67,7 +67,7 @@ void TestEchoQservRequest::onResponse(proto::FrameBufferView& view) { proto::WorkerCommandTestEchoR reply; view.parse(reply); - LOGS(_log, LOG_LVL_DEBUG, + LOGS(_log, LOG_LVL_TRACE, "TestEchoQservRequest ** SERVICE REPLY ** status: " << proto::WorkerCommandStatus_Code_Name(reply.status().code()));