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

don't issue a warning when transaction log iterator reports more data (#9869)

This commit is contained in:
Jan 2019-09-02 10:29:00 +02:00 committed by KVS85
parent 480f0e799a
commit 479e2ab5da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arangod/RocksDBEngine/RocksDBBuilderIndex.cpp
View File

@ -496,9 +496,10 @@ Result catchup(RocksDBIndex& ridx, WriteBatchType& wb, AccessMode::Type mode,
} }
s = iterator->status(); s = iterator->status();
// we can ignore it if we get a try again when we have exclusive access, // we can ignore it if we get a try again return value, because that either
// because that indicates a write to another collection // indicates a write to another collection, or a write to this collection if
if (!s.ok() && res.ok() && !(haveExclusiveAccess && s.IsTryAgain())) { // we are not in exclusive mode, in which case we will call catchup again
if (!s.ok() && res.ok() && !s.IsTryAgain()) {
LOG_TOPIC("8e3a4", WARN, Logger::ENGINES) << "iterator error '" << LOG_TOPIC("8e3a4", WARN, Logger::ENGINES) << "iterator error '" <<
s.ToString() << "'"; s.ToString() << "'";
res = rocksutils::convertStatus(s); res = rocksutils::convertStatus(s);