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

Merge branch 'devel' of github.com:arangodb/arangodb into devel 

* 'devel' of github.com:arangodb/arangodb:
  more robust network independance in RAFT election cycle
  more robust network independance in RAFT election cycle
This commit is contained in:
Jan Christoph Uhde 2016-09-09 16:08:53 +02:00
parent c0d254af03 8a3f3c026c
commit 61c6e3b9df
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Agency/AgencyFeature.cpp
View File

@ -40,8 +40,8 @@ AgencyFeature::AgencyFeature(application_features::ApplicationServer* server)
_activated(false),
_size(1),
_poolSize(1),
_minElectionTimeout(0.5),
_maxElectionTimeout(2.5),
_minElectionTimeout( 2.0),
_maxElectionTimeout(10.0),
_supervision(false),
_waitForSync(true),
_supervisionFrequency(5.0),

2
arangod/Agency/Agent.cpp
View File

@ -563,7 +563,7 @@ void Agent::run() {
// Leader working only
if (leading()) {
_appendCV.wait(10000);
_appendCV.wait(1000);
// Append entries to followers
sendAppendEntriesRPC();

2
arangod/Agency/Constituent.cpp
View File

@ -417,7 +417,7 @@ void Constituent::run() {
std::vector<std::string> act = _agent->config().active();
while (!this->isStopping() && find(act.begin(), act.end(), _id) == act.end()) {
CONDITION_LOCKER(guardv, _cv);
_cv.wait(500000);
_cv.wait(50000);
act = _agent->config().active();
}

4
scripts/startLocalCluster.sh
View File

@ -46,8 +46,8 @@ fi
SECONDARIES="$5"
MINP=0.5
MAXP=2.5
MINP=1.0
MAXP=5.0
SFRE=5.0
COMP=1000
BASE=4001