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

integrated agency bugfix from 3.0

This commit is contained in:
Kaveh Vahedipour 2016-08-01 14:41:13 +00:00
parent da893cc056
commit 3a1e10eecb
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/Agency/State.cpp
View File

@ -173,9 +173,10 @@ void State::removeConflicts (query_t const& transactions) {
try { try {
auto idx = slice[0].get("index").getUInt(); auto idx = slice[0].get("index").getUInt();
if (idx-_cur < _log.size()) { if (idx-_cur < _log.size()) {
LOG_TOPIC(INFO, Logger::AGENCY) << LOG_TOPIC(INFO, Logger::AGENCY)
"Removing " << _log.size()-idx+_cur << " entries from log starting with " << idx; << "Removing " << _log.size()-idx+_cur
_log.erase(_log.begin()+idx); << " entries from log starting with " << idx;
_log.erase(_log.begin()+idx);
} }
} catch (std::exception const& e) { } catch (std::exception const& e) {
LOG_TOPIC(ERR, Logger::AGENCY) << e.what() << " " << __FILE__ << __LINE__; LOG_TOPIC(ERR, Logger::AGENCY) << e.what() << " " << __FILE__ << __LINE__;