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

Adjust two error codes (TRI_ERROR_SHUTTING_DOWN). (#7779)

This commit is contained in:
Max Neunhöffer 2018-12-17 09:50:53 +01:00 committed by GitHub
parent 92b7df5a1d
commit 1c4430afdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Cluster/SynchronizeShard.cpp
View File

@ -810,7 +810,7 @@ bool SynchronizeShard::first() {
"synchronizeOneShard: synchronization failed for shard "); "synchronizeOneShard: synchronization failed for shard ");
errorMessage += shard + ": shutdown in progress, giving up"; errorMessage += shard + ": shutdown in progress, giving up";
LOG_TOPIC(INFO, Logger::MAINTENANCE) << errorMessage; LOG_TOPIC(INFO, Logger::MAINTENANCE) << errorMessage;
_result.reset(TRI_ERROR_INTERNAL, errorMessage); _result.reset(TRI_ERROR_SHUTTING_DOWN, errorMessage);
return false; return false;
} }
@ -951,7 +951,7 @@ ResultT<TRI_voc_tick_t> SynchronizeShard::catchupWithReadLock(
if (isStopping()) { if (isStopping()) {
std::string errorMessage = std::string errorMessage =
"synchronizeOneShard: startReadLockOnLeader (soft): shutting down"; "synchronizeOneShard: startReadLockOnLeader (soft): shutting down";
return ResultT<TRI_voc_tick_t>::error(TRI_ERROR_INTERNAL, errorMessage); return ResultT<TRI_voc_tick_t>::error(TRI_ERROR_SHUTTING_DOWN, errorMessage);
} }
didTimeout = false; didTimeout = false;