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 2016-12-23 16:34:10 +01:00
parent fcdc7601f3 fc52c04bf4
commit 3c487165b8
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arangod/Agency/AgentCallback.cpp
View File

@ -42,15 +42,19 @@ bool AgentCallback::operator()(arangodb::ClusterCommResult* res) {
if (_agent) { if (_agent) {
_agent->reportIn(_slaveID, _last); _agent->reportIn(_slaveID, _last);
} }
LOG_TOPIC(DEBUG, Logger::AGENCY) << "comm_status(" << res->status LOG_TOPIC(DEBUG, Logger::AGENCY)
<< "), last(" << _last << "), follower(" << "Got good callback from AppendEntriesRPC: "
<< _slaveID << "), time(" << "comm_status(" << res->status
<< TRI_microtime() - _startTime << ")"; << "), last(" << _last << "), follower("
<< _slaveID << "), time("
<< TRI_microtime() - _startTime << ")";
} else { } else {
LOG_TOPIC(DEBUG, Logger::AGENCY) << "comm_status(" << res->status LOG_TOPIC(DEBUG, Logger::AGENCY)
<< "), last(" << _last << "), follower(" << "Got bad callback from AppendEntriesRPC: "
<< _slaveID << "), time(" << "comm_status(" << res->status
<< TRI_microtime() - _startTime << ")"; << "), last(" << _last << "), follower("
<< _slaveID << "), time("
<< TRI_microtime() - _startTime << ")";
} }
return true; return true;
} }

7
arangod/Agency/Constituent.cpp
View File

@ -112,8 +112,8 @@ void Constituent::termNoLock(term_t t) {
_term = t; _term = t;
if (tmp != t) { if (tmp != t) {
LOG_TOPIC(DEBUG, Logger::AGENCY) << _id << ": " << roleStr[_role] LOG_TOPIC(DEBUG, Logger::AGENCY) << _id << ": changing term, current role:"
<< " term " << t; << roleStr[_role] << " new term " << t;
_cast = false; _cast = false;
Builder body; Builder body;
@ -345,7 +345,8 @@ bool Constituent::vote(term_t termOfPeer, std::string id, index_t prevLogIndex,
if (prevLogTerm > myLastLogEntry.term || if (prevLogTerm > myLastLogEntry.term ||
(prevLogTerm == myLastLogEntry.term && (prevLogTerm == myLastLogEntry.term &&
prevLogIndex >= myLastLogEntry.index)) { prevLogIndex >= myLastLogEntry.index)) {
LOG_TOPIC(DEBUG, Logger::AGENCY) << "voting for " << id; LOG_TOPIC(DEBUG, Logger::AGENCY) << "voting for " << id << " in term "
<< _term;
_cast = true; _cast = true;
_votedFor = id; _votedFor = id;
return true; return true;