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

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

This commit is contained in:
Michael Hackstein 2016-10-17 15:21:29 +02:00
parent 682f4a40d2 d133b920ba
commit 5046d00e53
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/HeartbeatThread.cpp
View File

@ -327,7 +327,7 @@ void HeartbeatThread::runCoordinator() {
while (!isStopping()) {
try {
LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "sending heartbeat to agency";
LOG_TOPIC(DEBUG, Logger::HEARTBEAT) << "sending heartbeat to agency";
double const start = TRI_microtime();
// send our state to the agency.

13
arangod/Statistics/statistics.cpp
View File

@ -127,8 +127,17 @@ static void ProcessRequestStatistics(TRI_request_statistics_t* statistics) {
statistics->reset();
// put statistics item back onto the freelist
bool ok = RequestFreeList.push(statistics);
TRI_ASSERT(ok);
int tries = 0;
while (++tries < 1000) {
if (RequestFreeList.push(statistics)) {
break;
}
usleep(10000);
}
if (tries > 1) {
LOG_TOPIC(WARN, Logger::REQUESTS) << "RequestFreeList.push failed "
<< tries-1 << " times.";
}
}
////////////////////////////////////////////////////////////////////////////////