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

potentially fix logic errors

This commit is contained in:
jsteemann 2016-09-07 15:10:26 +02:00
parent 5807d121e6
commit f178cf0cfd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Wal/CollectorThread.cpp
View File

@ -244,7 +244,7 @@ int CollectorThread::waitForResult(uint64_t timeout) {
CONDITION_LOCKER(guard, _collectorResultCondition); CONDITION_LOCKER(guard, _collectorResultCondition);
if (_collectorResult == TRI_ERROR_NO_ERROR) { if (_collectorResult == TRI_ERROR_NO_ERROR) {
if (guard.wait(timeout)) { if (!guard.wait(timeout)) {
return TRI_ERROR_LOCK_TIMEOUT; return TRI_ERROR_LOCK_TIMEOUT;
} }
} }
@ -385,6 +385,7 @@ int CollectorThread::collectLogfiles(bool& worked) {
{ {
CONDITION_LOCKER(guard, _collectorResultCondition); CONDITION_LOCKER(guard, _collectorResultCondition);
_collectorResult = TRI_ERROR_NO_ERROR; _collectorResult = TRI_ERROR_NO_ERROR;
_collectorResultCondition.broadcast();
} }
#ifdef ARANGODB_ENABLE_ROCKSDB #ifdef ARANGODB_ENABLE_ROCKSDB