expanding agent pool

arangod/Agency/Agent.cpp

@@ -560,23 +560,24 @@ bool Agent::load() {
   reportIn(id(), _state.lastLog().index);
 
   _compactor.start();
+  TRI_ASSERT(queryRegistry != nullptr);
 
   LOG_TOPIC(DEBUG, Logger::AGENCY) << "Starting spearhead worker.";
   if (size() == 1 || !this->isStopping()) {
     _spearhead.start();
     _readDB.start();
   }
-
+ 
   TRI_ASSERT(queryRegistry != nullptr);
   if (size() == 1) {
     activateAgency();
   }
-
+ 
   if (size() == 1 || !this->isStopping()) {
     _constituent.start(vocbase, queryRegistry);
     persistConfiguration(term());
   }
-
+ 
   if (size() == 1 || (!this->isStopping() && _config.supervision())) {
     LOG_TOPIC(DEBUG, Logger::AGENCY) << "Starting cluster sanity facilities";
     _supervision.start(this);
@@ -1311,8 +1312,6 @@ query_t Agent::gossip(query_t const& in, bool isCallback, size_t version) {
         20002, "Gossip message must contain string parameter 'id'");
   }
 
-  
-  
   if (!slice.hasKey("endpoint") || !slice.get("endpoint").isString()) {
     THROW_ARANGO_EXCEPTION_MESSAGE(
         20003, "Gossip message must contain string parameter 'endpoint'");
@@ -1332,6 +1331,12 @@ query_t Agent::gossip(query_t const& in, bool isCallback, size_t version) {
   }
   VPackSlice pslice = slice.get("pool");
 
+  if (slice.hasKey("active") && slice.get("active").isArray()) {
+    for (auto const& a : VPackArrayIterator(slice.get("active"))) {
+      _config.activePushBack(a.copyString());
+    }
+  }
+
   LOG_TOPIC(TRACE, Logger::AGENCY) << "Received gossip " << slice.toJson();
 
   std::map<std::string, std::string> incoming;
@@ -1361,13 +1366,6 @@ query_t Agent::gossip(query_t const& in, bool isCallback, size_t version) {
     size_t counter = 0;
     for (auto const& i : incoming) {
       
-      /// more data than pool size: fatal!
-      if (++counter > _config.poolSize()) {
-        LOG_TOPIC(FATAL, Logger::AGENCY)
-          << "Too many peers in pool: " << counter << ">" << _config.poolSize();
-        FATAL_ERROR_EXIT();
-      }
-      
       /// disagreement over pool membership: fatal!
       if (!_config.addToPool(i)) {
         LOG_TOPIC(FATAL, Logger::AGENCY) << "Discrepancy in agent pool!";
@@ -1377,10 +1375,10 @@ query_t Agent::gossip(query_t const& in, bool isCallback, size_t version) {
     }
     
     if (!isCallback) { // no gain in callback to a callback.
-      std::map<std::string, std::string> pool = _config.pool();
-      
-      out->add("endpoint", VPackValue(_config.endpoint()));
-      out->add("id", VPackValue(_config.id()));
+      auto pool = _config.pool();
+      auto active = _config.active();
+
+      // Wrapped in envelope in RestAgencyPriveHandler
       out->add(VPackValue("pool"));
       {
         VPackObjectBuilder bb(out.get());
@@ -1388,6 +1386,13 @@ query_t Agent::gossip(query_t const& in, bool isCallback, size_t version) {
           out->add(i.first, VPackValue(i.second));
         }
       }
+      out->add(VPackValue("active"));
+      {
+        VPackArrayBuilder bb(out.get());
+        for (auto const& i : active) {
+          out->add(VPackValue(i));
+        }
+      }
     }
   }
   

arangod/Agency/Constituent.cpp

@@ -565,6 +565,7 @@ void Constituent::run() {
   }
 
   std::vector<std::string> act = _agent->config().active();
+  LOG_TOPIC(WARN, Logger::AGENCY) << __FILE__ << __LINE__ << " " << act;
   while (
     !this->isStopping() // Obvious
     && (!_agent->ready()

arangod/Agency/RestAgencyPrivHandler.cpp

@@ -161,7 +161,9 @@ RestStatus RestAgencyPrivHandler::execute() {
         query_t query = _request->toVelocyPackBuilderPtr();
         try {
           query_t ret = _agent->gossip(query);
-          result.add("pool", ret->slice().get("pool"));
+          for (auto const& obj : VPackObjectIterator(ret->slice())) {
+            result.add(obj.key.copyString(), obj.value);
+          }
         } catch (std::exception const& e) {
           return reportBadQuery(e.what());
         }

scripts/startStandAloneAgency.sh

@@ -190,7 +190,7 @@ mkdir -p agency
 PIDS=""
 
 aaid=(`seq 0 $(( $POOLSZ - 1 ))`)
-shuffle
+#shuffle
 
 count=1