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

Further rearrangement in election loop.

This commit is contained in:
Max Neunhoeffer 2016-12-20 09:24:19 +01:00
parent dcc015f37a
commit 47297624ce
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arangod/Agency/Constituent.cpp
View File

@ -421,12 +421,22 @@ void Constituent::callElection() {
// Collect ballots. I vote for myself. // Collect ballots. I vote for myself.
size_t yea = 1; size_t yea = 1;
size_t nea = 0; size_t nay = 0;
size_t majority = size() / 2 + 1; size_t majority = size() / 2 + 1;
bool leading = false;
// We collect votes, we leave the following loop when one of the following
// conditions is met:
// (1) A majority of nay votes have been received
// (2) A majority of yea votes (including ourselves) have been received
// (3) At least yyy time has passed, in this case we give up without
// a conclusive vote.
while (true) { while (true) {
if (steady_clock::now() >= timeout) { // Timeout.
follow(_term);
break;
}
auto res = ClusterComm::instance()->wait( auto res = ClusterComm::instance()->wait(
"", coordinatorTransactionID, 0, "", "", coordinatorTransactionID, 0, "",
duration<double>(steady_clock::now()-timeout).count()); duration<double>(steady_clock::now()-timeout).count());
@ -448,44 +458,20 @@ void Constituent::callElection() {
// Check result and counts // Check result and counts
if(slc.get("voteGranted").getBool()) { // majority in favour? if(slc.get("voteGranted").getBool()) { // majority in favour?
if (++yea >= majority) { if (++yea >= majority) {
//if (!leading) {
lead(savedTerm, votes); lead(savedTerm, votes);
break; break;
//leading = true;
//}
}
} else {
if (++nea >= majority) { // No: majority against?
follow(_term);
break;
} }
// Vote is counted as yea, continue loop
continue;
} }
} else {
if (++nea >= majority) { // Invalid: majority against?
follow(_term);
break;
}
}
} else {
if (++nea >= majority) { // Network: majority against?
follow(_term);
break;
} }
} }
// Count the vote as a nay
if (steady_clock::now() >= timeout) { // Timeout. if (++nay >= majority) { // Network: majority against?
if (yea >= majority) { follow(_term);
if (!leading) {
lead(savedTerm, votes);
leading = true;
}
} else {
follow(_term);
}
break; break;
} }
} }
// Clean up // Clean up