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

suppress some of these dreaded error messages (#6786)

This commit is contained in:
Jan 2018-10-11 10:46:12 +02:00 committed by GitHub
parent 4644d2b023
commit c7cd0262aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/ClusterInfo.cpp
View File

@ -1009,7 +1009,7 @@ void ClusterInfo::loadCurrent() {
return; return;
} }
LOG_TOPIC(ERR, Logger::CLUSTER) << "Error while loading " << prefixCurrent LOG_TOPIC(DEBUG, Logger::CLUSTER) << "Error while loading " << prefixCurrent
<< " httpCode: " << result.httpCode() << " httpCode: " << result.httpCode()
<< " errorCode: " << result.errorCode() << " errorCode: " << result.errorCode()
<< " errorMessage: " << result.errorMessage() << " errorMessage: " << result.errorMessage()

6
arangod/Cluster/HeartbeatThread.cpp
View File

@ -414,8 +414,10 @@ void HeartbeatThread::runDBServer() {
AgencyCommResult result = _agency.sendTransactionWithFailover(trx, 1.0); AgencyCommResult result = _agency.sendTransactionWithFailover(trx, 1.0);
if (!result.successful()) { if (!result.successful()) {
if (!application_features::ApplicationServer::isStopping()) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) LOG_TOPIC(WARN, Logger::HEARTBEAT)
<< "Heartbeat: Could not read from agency!"; << "Heartbeat: Could not read from agency!";
}
} else { } else {
VPackSlice agentPool = result.slice()[0].get(".agency"); VPackSlice agentPool = result.slice()[0].get(".agency");
@ -586,10 +588,12 @@ void HeartbeatThread::runSingleServer() {
"/.agency"})); "/.agency"}));
AgencyCommResult result = _agency.sendTransactionWithFailover(trx, timeout); AgencyCommResult result = _agency.sendTransactionWithFailover(trx, timeout);
if (!result.successful()) { if (!result.successful()) {
if (!application_features::ApplicationServer::isStopping()) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) LOG_TOPIC(WARN, Logger::HEARTBEAT)
<< "Heartbeat: Could not read from agency! status code: " << "Heartbeat: Could not read from agency! status code: "
<< result._statusCode << ", incriminating body: " << result._statusCode << ", incriminating body: "
<< result.bodyRef() << ", timeout: " << timeout; << result.bodyRef() << ", timeout: " << timeout;
}
if (!applier->isActive()) { // assume agency and leader are gone if (!applier->isActive()) { // assume agency and leader are gone
ServerState::instance()->setFoxxmaster(_myId); ServerState::instance()->setFoxxmaster(_myId);
@ -835,10 +839,12 @@ void HeartbeatThread::runCoordinator() {
AgencyCommResult result = _agency.sendTransactionWithFailover(trx, timeout); AgencyCommResult result = _agency.sendTransactionWithFailover(trx, timeout);
if (!result.successful()) { if (!result.successful()) {
if (!application_features::ApplicationServer::isStopping()) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) LOG_TOPIC(WARN, Logger::HEARTBEAT)
<< "Heartbeat: Could not read from agency! status code: " << "Heartbeat: Could not read from agency! status code: "
<< result._statusCode << ", incriminating body: " << result._statusCode << ", incriminating body: "
<< result.bodyRef() << ", timeout: " << timeout; << result.bodyRef() << ", timeout: " << timeout;
}
} else { } else {
VPackSlice agentPool = result.slice()[0].get(".agency"); VPackSlice agentPool = result.slice()[0].get(".agency");

11
arangod/Cluster/v8-cluster.cpp
View File

@ -27,6 +27,7 @@
#include <velocypack/velocypack-aliases.h> #include <velocypack/velocypack-aliases.h>
#include "Agency/AgencyComm.h" #include "Agency/AgencyComm.h"
#include "ApplicationFeatures/ApplicationServer.h"
#include "Cluster/ClusterComm.h" #include "Cluster/ClusterComm.h"
#include "Cluster/ClusterInfo.h" #include "Cluster/ClusterInfo.h"
#include "Cluster/ServerState.h" #include "Cluster/ServerState.h"
@ -1110,11 +1111,13 @@ static void JS_setFoxxmasterQueueupdate(v8::FunctionCallbackInfo<v8::Value> cons
std::string key = "Current/FoxxmasterQueueupdate"; std::string key = "Current/FoxxmasterQueueupdate";
VPackSlice val = queueUpdate ? VPackSlice::trueSlice() : VPackSlice::falseSlice(); VPackSlice val = queueUpdate ? VPackSlice::trueSlice() : VPackSlice::falseSlice();
AgencyCommResult result = comm.setValue(key, val, 0.0); AgencyCommResult result = comm.setValue(key, val, 0.0);
if (!result.successful()) { if (result.successful()) {
THROW_AGENCY_EXCEPTION(result);
}
result = comm.increment("Current/Version"); result = comm.increment("Current/Version");
if (!result.successful()) { }
if (!result.successful() &&
result.errorCode() != TRI_ERROR_SHUTTING_DOWN &&
!application_features::ApplicationServer::isStopping()) {
// gracefully ignore any shutdown errors here
THROW_AGENCY_EXCEPTION(result); THROW_AGENCY_EXCEPTION(result);
} }
} }