From 845701de6de75c1279c245a7c9427fe10cd990bc Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 1 Oct 2019 19:15:07 +0200 Subject: [PATCH] fix broken & duplicate logIds (#10134) --- arangod/Agency/StoreCallback.cpp | 4 ++-- arangod/Aql/IResearchViewExecutor.cpp | 4 ++-- arangod/Cluster/ClusterMethods.cpp | 2 +- arangod/IResearch/IResearchAnalyzerFeature.cpp | 2 +- arangod/VocBase/Methods/UpgradeTasks.cpp | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arangod/Agency/StoreCallback.cpp b/arangod/Agency/StoreCallback.cpp index d065b2338b..96d0d8670a 100644 --- a/arangod/Agency/StoreCallback.cpp +++ b/arangod/Agency/StoreCallback.cpp @@ -34,12 +34,12 @@ StoreCallback::StoreCallback( bool StoreCallback::operator()(arangodb::ClusterCommResult* res) { if (res->status == CL_COMM_ERROR) { - LOG_TOPIC("9sdbf0", TRACE, Logger::AGENCY) + LOG_TOPIC("d6329", TRACE, Logger::AGENCY) << _url << "(" << res->status << ", " << res->errorMessage << "): " << _body->toJson(); if (res->result->getHttpReturnCode() == 404 && _agent != nullptr) { - LOG_TOPIC("9sdbf0", DEBUG, Logger::AGENCY) << "dropping dead callback at " << _url; + LOG_TOPIC("68c37", DEBUG, Logger::AGENCY) << "dropping dead callback at " << _url; _agent->trashStoreCallback(_url, _body); } } diff --git a/arangod/Aql/IResearchViewExecutor.cpp b/arangod/Aql/IResearchViewExecutor.cpp index aecd0bba9a..8931123579 100644 --- a/arangod/Aql/IResearchViewExecutor.cpp +++ b/arangod/Aql/IResearchViewExecutor.cpp @@ -716,7 +716,7 @@ void IResearchViewMergeExecutor::reset() { auto sortReader = ::sortColumn(segment); if (!sortReader) { - LOG_TOPIC("ad14z", WARN, arangodb::iresearch::TOPIC) + LOG_TOPIC("af4cd", WARN, arangodb::iresearch::TOPIC) << "encountered a sub-reader without a sort column while " "executing a query, ignoring"; continue; @@ -766,7 +766,7 @@ void IResearchViewMergeExecutor::reset() { auto pkReader = ::pkColumn(segment); if (!pkReader) { - LOG_TOPIC("bd81z", WARN, arangodb::iresearch::TOPIC) + LOG_TOPIC("ee041", WARN, arangodb::iresearch::TOPIC) << "encountered a sub-reader without a primary key column while " "executing a query, ignoring"; continue; diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp index 7d25365591..8c07ac3c11 100644 --- a/arangod/Cluster/ClusterMethods.cpp +++ b/arangod/Cluster/ClusterMethods.cpp @@ -4310,7 +4310,7 @@ arangodb::Result listHotBackupsOnCoordinator(VPackSlice const payload, VPackBuil return arangodb::Result( TRI_ERROR_CLUSTER_TIMEOUT, "timeout waiting for all db servers to report backup list"); } else { - LOG_TOPIC("f9u3f", DEBUG, Logger::BACKUP) << "failed to get a hot backup listing from all db servers waiting " << wait.count() << " seconds"; + LOG_TOPIC("76865", DEBUG, Logger::BACKUP) << "failed to get a hot backup listing from all db servers waiting " << wait.count() << " seconds"; std::this_thread::sleep_for(wait); wait *= 1.1; } diff --git a/arangod/IResearch/IResearchAnalyzerFeature.cpp b/arangod/IResearch/IResearchAnalyzerFeature.cpp index 6a97ba8e93..57f5bfb681 100644 --- a/arangod/IResearch/IResearchAnalyzerFeature.cpp +++ b/arangod/IResearch/IResearchAnalyzerFeature.cpp @@ -1348,7 +1348,7 @@ IResearchAnalyzerFeature::AnalyzerPool::ptr IResearchAnalyzerFeature::get( // fi return pool; } - LOG_TOPIC("1a29z", WARN, arangodb::iresearch::TOPIC) + LOG_TOPIC("826db", WARN, arangodb::iresearch::TOPIC) << "failure to get arangosearch analyzer name '" << name << "'"; TRI_set_errno(TRI_ERROR_INTERNAL); } catch (arangodb::basics::Exception& e) { diff --git a/arangod/VocBase/Methods/UpgradeTasks.cpp b/arangod/VocBase/Methods/UpgradeTasks.cpp index 3822574c86..ee2928baf8 100644 --- a/arangod/VocBase/Methods/UpgradeTasks.cpp +++ b/arangod/VocBase/Methods/UpgradeTasks.cpp @@ -414,7 +414,7 @@ bool UpgradeTasks::createSystemCollectionsAndIndices(TRI_vocbase_t& vocbase, // present or created), raise an error if not? if (res.fail()) { - LOG_TOPIC("e32fi", ERR, Logger::STARTUP) + LOG_TOPIC("94824", ERR, Logger::STARTUP) << "could not create system collections" << ": error: " << res.errorMessage(); return false; @@ -433,7 +433,7 @@ bool UpgradeTasks::createSystemCollectionsAndIndices(TRI_vocbase_t& vocbase, res = ::createSystemCollectionsIndices(vocbase, presentSystemCollections); if (res.fail()) { - LOG_TOPIC("e32fx", ERR, Logger::STARTUP) + LOG_TOPIC("fedc0", ERR, Logger::STARTUP) << "could not create indices for system collections" << ": error: " << res.errorMessage(); return false; @@ -452,7 +452,7 @@ bool UpgradeTasks::createStatisticsCollectionsAndIndices(TRI_vocbase_t& vocbase, res = ::createSystemStatisticsCollections(vocbase, presentSystemCollections); if (res.fail()) { - LOG_TOPIC("e32fy", ERR, Logger::STARTUP) + LOG_TOPIC("2824e", ERR, Logger::STARTUP) << "could not create system collections" << ": error: " << res.errorMessage(); return false; @@ -460,7 +460,7 @@ bool UpgradeTasks::createStatisticsCollectionsAndIndices(TRI_vocbase_t& vocbase, res = ::createSystemStatisticsIndices(vocbase, presentSystemCollections); if (res.fail()) { - LOG_TOPIC("e32fx", ERR, Logger::STARTUP) + LOG_TOPIC("dffbd", ERR, Logger::STARTUP) << "could not create indices for system collections" << ": error: " << res.errorMessage(); return false;