mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
This commit is contained in:
commit
577c2aee11
|
@ -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";
|
||||||
|
|
Loading…
Reference in New Issue