Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix broken & duplicate logIds (#10134)

This commit is contained in:
Jan 2019-10-01 19:15:07 +02:00 committed by KVS85
parent 7893f178a0
commit 845701de6d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Agency/StoreCallback.cpp
View File

@ -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);
}
}

4
arangod/Aql/IResearchViewExecutor.cpp
View File

@ -716,7 +716,7 @@ void IResearchViewMergeExecutor<ordered>::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<ordered>::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;

2
arangod/Cluster/ClusterMethods.cpp
View File

@ -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;
}

2
arangod/IResearch/IResearchAnalyzerFeature.cpp
View File

@ -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) {

8
arangod/VocBase/Methods/UpgradeTasks.cpp
View File

@ -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;