too ambitious minimum election time in agency for wait-for-sync

arangod/Agency/AgencyFeature.cpp

@@ -39,7 +39,7 @@ AgencyFeature::AgencyFeature(application_features::ApplicationServer* server)
     : ApplicationFeature(server, "Agency"),
       _size(1),
       _agentId(0),
-      _minElectionTimeout(0.25),
+      _minElectionTimeout(0.5),
       _maxElectionTimeout(2.5),
       _notify(false),
       _supervision(false),
@@ -174,10 +174,11 @@ void AgencyFeature::start() {
   auto endpoints = endpointFeature->httpEndpoints();
   
   if (!endpoints.empty()) {
-    size_t pos = endpoints[0].find(':',10);
+    std::string const& tmp = endpoints.front();
+    size_t pos = tmp.find(':',10);
     
     if (pos != std::string::npos) {
-      port = endpoints[0].substr(pos + 1, endpoints[0].size() - pos);
+      port = tmp.substr(pos + 1, tmp.size() - pos);
     }
   }
   

arangod/Agency/State.cpp

@@ -266,7 +266,7 @@ bool State::createCollection(std::string const& name) {
 bool State::loadCollections(TRI_vocbase_t* vocbase, bool waitForSync) {
 
   _vocbase = vocbase;
-  _options.waitForSync = waitForSync;
+  _options.waitForSync = false;
   _options.silent = true;
 
   if (loadPersisted()) {

scripts/startLocalCluster.sh

@@ -46,9 +46,8 @@ fi
 
 SECONDARIES="$5"
 
-MINP=0.25
+MINP=0.5
 MAXP=2.5
-SFRE=2.5
 COMP=1000
 BASE=4001
 NATH=$(( $NRDBSERVERS + $NRCOORDINATORS + $NRAGENTS ))
@@ -67,7 +66,6 @@ if [ $NRAGENTS -gt 1 ]; then
            --agency.election-timeout-max $MAXP \
            --agency.size $NRAGENTS \
            --agency.supervision true \
-           --agency.supervision-frequency $SFRE \
            --agency.wait-for-sync false \
            --database.directory cluster/data$port \
            --javascript.app-path ./js/apps \
@@ -95,7 +93,6 @@ build/bin/arangod \
     --agency.notify true \
     --agency.size $NRAGENTS \
     --agency.supervision true \
-    --agency.supervision-frequency $SFRE \
     --agency.wait-for-sync false \
     --database.directory cluster/data$(( $BASE + $aid )) \
     --javascript.app-path ./js/apps \