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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-09-01 11:26:18 +02:00
parent 9591882cee 3bcd9f1cc8
commit 577c2aee11
1 changed files with 214 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/Cluster/HeartbeatThread.cpp
View File

@ -172,10 +172,10 @@ void HeartbeatThread::runDBServer() {
int currentCount = currentCountStart; int currentCount = currentCountStart;
while (!isStopping()) { while (!isStopping()) {
try {
LOG_TOPIC(DEBUG, Logger::HEARTBEAT) << "sending heartbeat to agency"; LOG_TOPIC(DEBUG, Logger::HEARTBEAT) << "sending heartbeat to agency";
double const start = TRI_microtime(); double const start = TRI_microtime();
// send our state to the agency. // send our state to the agency.
// we don't care if this fails // we don't care if this fails
sendState(); sendState();
@ -278,6 +278,11 @@ void HeartbeatThread::runDBServer() {
} }
remain = interval - (TRI_microtime() - start); remain = interval - (TRI_microtime() - start);
} while (remain > 0); } while (remain > 0);
} catch (std::exception const& e) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an exception in DBServer heartbeat: " << e.what();
} catch (...) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an unknown exception in DBServer heartbeat";
}
} }
_agencyCallbackRegistry->unregisterCallback(planAgencyCallback); _agencyCallbackRegistry->unregisterCallback(planAgencyCallback);
@ -318,6 +323,7 @@ void HeartbeatThread::runCoordinator() {
setReady(); setReady();
while (!isStopping()) { while (!isStopping()) {
try {
LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "sending heartbeat to agency"; LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "sending heartbeat to agency";
double const start = TRI_microtime(); double const start = TRI_microtime();
@ -451,6 +457,11 @@ void HeartbeatThread::runCoordinator() {
remain = 0.0; remain = 0.0;
} }
} }
} catch (std::exception const& e) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an exception in coordinator heartbeat: " << e.what();
} catch (...) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an unknown exception in coordinator heartbeat";
}
} }
LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "stopped heartbeat thread"; LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "stopped heartbeat thread";