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:
Kaveh Vahedipour 2017-01-10 09:20:02 +01:00
parent 60bb992b4d d37218d18f
commit adf3778f34
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/V8Server/v8-vocbase.cpp
View File

@ -521,6 +521,10 @@ static void JS_FlushWal(v8::FunctionCallbackInfo<v8::Value> const& args) {
waitForSync, waitForCollector, writeShutdownFile);
if (res != TRI_ERROR_NO_ERROR) {
if (res == TRI_ERROR_LOCK_TIMEOUT) {
// improved diagnostic message for this special case
TRI_V8_THROW_EXCEPTION_MESSAGE(res, "timed out waiting for WAL flush operation");
}
TRI_V8_THROW_EXCEPTION(res);
}

4
arangod/Wal/LogfileManager.cpp
View File

@ -1373,8 +1373,8 @@ int LogfileManager::getWriteableLogfile(uint32_t size,
}
TRI_ASSERT(result == nullptr);
LOG(WARN) << "unable to acquire writeable WAL logfile after "
<< (MaxIterations * SleepTime) / 1000 << " ms";
LOG(ERR) << "unable to acquire writeable WAL logfile after "
<< (MaxIterations * SleepTime) / 1000 << " ms";
return TRI_ERROR_LOCK_TIMEOUT;
}