arangodb · gnusi · Jan 31, 2022 · Jan 22, 2022 · Jan 23, 2022 · Jan 23, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1365,6 +1365,7 @@ list(INSERT SYSTEM_LIBRARIES 0
   ${SYS_LIBS}
   ${CMAKE_DL_LIBS}
   ${CMAKE_THREAD_LIBS_INIT}
+  absl-static
 )
 
 add_subdirectory(lib)

diff --git a/arangod/Actions/ActionFeature.cpp b/arangod/Actions/ActionFeature.cpp
@@ -23,21 +23,19 @@
 
 #include "ActionFeature.h"
 
-#include "Actions/actions.h"
 #include "ApplicationFeatures/ApplicationServer.h"
-#include "FeaturePhases/ClusterFeaturePhase.h"
+#include "Actions/actions.h"
 #include "ProgramOptions/ProgramOptions.h"
-#include "ProgramOptions/Section.h"
 
 using namespace arangodb::application_features;
 using namespace arangodb::options;
 
 namespace arangodb {
 
-ActionFeature::ActionFeature(application_features::ApplicationServer& server)
-    : ApplicationFeature(server, "Action"), _allowUseDatabase(false) {
+ActionFeature::ActionFeature(Server& server)
+    : ArangodFeature{server, *this}, _allowUseDatabase(false) {
   setOptional(true);
-  startsAfter<ClusterFeaturePhase>();
+  startsAfter<application_features::ClusterFeaturePhase>();
 }
 
 void ActionFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {

diff --git a/arangod/Actions/ActionFeature.h b/arangod/Actions/ActionFeature.h
@@ -23,13 +23,18 @@
 
 #pragma once
 
-#include "ApplicationFeatures/ApplicationFeature.h"
+#include "RestServer/arangod.h"
 
 namespace arangodb {
+namespace application_features {
+class ClusterFeaturePhase;
+}
 
-class ActionFeature final : public application_features::ApplicationFeature {
+class ActionFeature final : public ArangodFeature {
  public:
-  explicit ActionFeature(application_features::ApplicationServer& server);
+  static constexpr std::string_view name() noexcept { return "Action"; }
+
+  explicit ActionFeature(Server& server);
 
   void collectOptions(std::shared_ptr<options::ProgramOptions>) override final;
   void unprepare() override final;

diff --git a/arangod/Actions/RestActionHandler.cpp b/arangod/Actions/RestActionHandler.cpp
@@ -23,6 +23,7 @@
 
 #include "RestActionHandler.h"
 
+#include "ApplicationFeatures/ApplicationServer.h"
 #include "Actions/actions.h"
 #include "Basics/StaticStrings.h"
 #include "Basics/StringUtils.h"
@@ -34,9 +35,9 @@ using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
 
-RestActionHandler::RestActionHandler(
-    application_features::ApplicationServer& server, GeneralRequest* request,
-    GeneralResponse* response)
+RestActionHandler::RestActionHandler(ArangodServer& server,
+                                     GeneralRequest* request,
+                                     GeneralResponse* response)
     : RestVocbaseBaseHandler(server, request, response),
       _action(TRI_LookupActionVocBase(request)),
       _data(nullptr) {}

diff --git a/arangod/Actions/RestActionHandler.h b/arangod/Actions/RestActionHandler.h
@@ -31,8 +31,7 @@
 namespace arangodb {
 class RestActionHandler : public RestVocbaseBaseHandler {
  public:
-  RestActionHandler(application_features::ApplicationServer&, GeneralRequest*,
-                    GeneralResponse*);
+  RestActionHandler(ArangodServer&, GeneralRequest*, GeneralResponse*);
 
  public:
   char const* name() const override final { return "RestActionHandler"; }

diff --git a/arangod/Agency/AgencyComm.cpp b/arangod/Agency/AgencyComm.cpp
@@ -647,7 +647,7 @@ network::Timeout AgencyCommHelper::defaultTimeout() {
 
 std::string const AgencyComm::AGENCY_URL_PREFIX = "/_api/agency";
 
-AgencyComm::AgencyComm(application_features::ApplicationServer& server)
+AgencyComm::AgencyComm(ArangodServer& server)
     : _server(server),
       _agency_comm_request_time_ms(
           _server.getFeature<arangodb::ClusterFeature>()
@@ -1067,9 +1067,7 @@ AgencyCommResult AgencyComm::sendTransactionWithFailover(
   return result;
 }
 
-application_features::ApplicationServer& AgencyComm::server() {
-  return _server;
-}
+ArangodServer& AgencyComm::server() { return _server; }
 
 bool AgencyComm::ensureStructureInitialized() {
   LOG_TOPIC("748e2", TRACE, Logger::AGENCYCOMM)

diff --git a/arangod/Agency/AgencyComm.h b/arangod/Agency/AgencyComm.h
@@ -42,6 +42,7 @@
 #include "Basics/Result.h"
 #include "Network/types.h"
 #include "Rest/CommonDefines.h"
+#include "RestServer/arangod.h"
 #include "Metrics/Fwd.h"
 
 namespace arangodb {
@@ -584,7 +585,7 @@ class AgencyComm {
   static uint64_t const MAX_SLEEP_TIME = 50000;     // microseconds
 
  public:
-  explicit AgencyComm(application_features::ApplicationServer&);
+  explicit AgencyComm(ArangodServer&);
 
   AgencyCommResult sendServerState(double timeout);
 
@@ -648,7 +649,7 @@ class AgencyComm {
   AgencyCommResult sendTransactionWithFailover(AgencyTransaction const&,
                                                double timeout = 0.0);
 
-  application_features::ApplicationServer& server();
+  ArangodServer& server();
 
   bool ensureStructureInitialized();
 
@@ -668,7 +669,7 @@ class AgencyComm {
   bool shouldInitializeStructure();
 
  private:
-  application_features::ApplicationServer& _server;
+  ArangodServer& _server;
   metrics::Histogram<metrics::LogScale<uint64_t>>& _agency_comm_request_time_ms;
 };
 }  // namespace arangodb

diff --git a/arangod/Agency/AgencyFeature.cpp b/arangod/Agency/AgencyFeature.cpp
@@ -33,7 +33,6 @@
 #include "Basics/application-exit.h"
 #include "Cluster/ClusterFeature.h"
 #include "Endpoint/Endpoint.h"
-#include "FeaturePhases/FoxxFeaturePhase.h"
 #include "IResearch/IResearchAnalyzerFeature.h"
 #include "IResearch/IResearchFeature.h"
 #include "Logger/Logger.h"
@@ -51,8 +50,8 @@ using namespace arangodb::rest;
 
 namespace arangodb {
 
-AgencyFeature::AgencyFeature(application_features::ApplicationServer& server)
-    : ApplicationFeature(server, "Agency"),
+AgencyFeature::AgencyFeature(Server& server)
+    : ArangodFeature{server, *this},
       _activated(false),
       _size(1),
       _poolSize(1),
@@ -69,11 +68,9 @@ AgencyFeature::AgencyFeature(application_features::ApplicationServer& server)
       _supervisionOkThreshold(5.0),
       _cmdLineTimings(false) {
   setOptional(true);
-  startsAfter<FoxxFeaturePhase>();
+  startsAfter<application_features::FoxxFeaturePhase>();
 }
 
-AgencyFeature::~AgencyFeature() = default;
-
 void AgencyFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
   options->addSection("agency", "agency");
 
@@ -299,25 +296,23 @@ void AgencyFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
   // - ArangoSearch: not needed by agency
   // - IResearchAnalyzer: analyzers are not needed by agency
   // - Action/Script/FoxxQueues/Frontend: Foxx and JavaScript APIs
-
-  std::vector<std::type_index> disabledFeatures(
-      {std::type_index(typeid(iresearch::IResearchFeature)),
-       std::type_index(typeid(iresearch::IResearchAnalyzerFeature)),
-       std::type_index(typeid(ActionFeature)),
-       std::type_index(typeid(FoxxFeature)),
-       std::type_index(typeid(FrontendFeature))});
+  {
+    server().disableFeatures(std::array{
+        ArangodServer::id<iresearch::IResearchFeature>(),
+        ArangodServer::id<iresearch::IResearchAnalyzerFeature>(),
+        ArangodServer::id<ActionFeature>(), ArangodServer::id<FoxxFeature>(),
+        ArangodServer::id<FrontendFeature>()});
+  }
 
   if (!V8DealerFeature::javascriptRequestedViaOptions(options)) {
     // specifying --console requires JavaScript, so we can only turn Javascript
     // off if not requested
 
     // console mode inactive. so we can turn off V8
-    disabledFeatures.emplace_back(std::type_index(typeid(ScriptFeature)));
-    disabledFeatures.emplace_back(std::type_index(typeid(V8PlatformFeature)));
-    disabledFeatures.emplace_back(std::type_index(typeid(V8DealerFeature)));
+    server().disableFeatures(std::array{ArangodServer::id<ScriptFeature>(),
+                                        ArangodServer::id<V8PlatformFeature>(),
+                                        ArangodServer::id<V8DealerFeature>()});
   }
-
-  server().disableFeatures(disabledFeatures);
 }
 
 void AgencyFeature::prepare() {

diff --git a/arangod/Agency/AgencyFeature.h b/arangod/Agency/AgencyFeature.h
@@ -23,18 +23,23 @@
 
 #pragma once
 
-#include "ApplicationFeatures/ApplicationFeature.h"
+#include "Agency/Agent.h"
+#include "RestServer/arangod.h"
 
 namespace arangodb {
+namespace application_features {
+class FoxxFeaturePhase;
+}
 
 namespace consensus {
 class Agent;
 }
 
-class AgencyFeature : public application_features::ApplicationFeature {
+class AgencyFeature : public ArangodFeature {
  public:
-  explicit AgencyFeature(application_features::ApplicationServer& server);
-  ~AgencyFeature();
+  static constexpr std::string_view name() { return "Agency"; }
+
+  explicit AgencyFeature(Server& server);
 
   void collectOptions(std::shared_ptr<options::ProgramOptions>) override final;
   void validateOptions(std::shared_ptr<options::ProgramOptions>) override final;

diff --git a/arangod/Agency/Agent.cpp b/arangod/Agency/Agent.cpp
@@ -93,9 +93,8 @@ std::string const privApiPrefix("/_api/agency_priv/");
 std::string const NO_LEADER("");
 
 /// Agent configuration
-Agent::Agent(application_features::ApplicationServer& server,
-             config_t const& config)
-    : Thread(server, "Agent"),
+Agent::Agent(ArangodServer& server, config_t const& config)
+    : arangodb::ServerThread<ArangodServer>(server, "Agent"),
       _constituent(server),
       _supervision(server),
       _state(server),
@@ -109,29 +108,29 @@ Agent::Agent(application_features::ApplicationServer& server,
       _ready(false),
       _preparing(0),
       _loaded(false),
-      _write_ok(_server.getFeature<arangodb::metrics::MetricsFeature>().add(
+      _write_ok(server.getFeature<arangodb::metrics::MetricsFeature>().add(
           arangodb_agency_write_ok_total{})),
       _write_no_leader(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_write_no_leader_total{})),
-      _read_ok(_server.getFeature<arangodb::metrics::MetricsFeature>().add(
+      _read_ok(server.getFeature<arangodb::metrics::MetricsFeature>().add(
           arangodb_agency_read_ok_total{})),
       _read_no_leader(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_read_no_leader_total{})),
       _write_hist_msec(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_write_hist{})),
       _commit_hist_msec(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_commit_hist{})),
       _append_hist_msec(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_append_hist{})),
       _compaction_hist_msec(
-          _server.getFeature<arangodb::metrics::MetricsFeature>().add(
+          server.getFeature<arangodb::metrics::MetricsFeature>().add(
               arangodb_agency_compaction_hist{})),
-      _local_index(_server.getFeature<arangodb::metrics::MetricsFeature>().add(
+      _local_index(server.getFeature<arangodb::metrics::MetricsFeature>().add(
           arangodb_agency_local_commit_index{})) {
   _state.configure(this);
   _constituent.configure(this);
@@ -591,7 +590,7 @@ priv_rpc_ret_t Agent::recvAppendEntriesRPC(term_t term,
 
 /// Leader's append entries
 void Agent::sendAppendEntriesRPC() {
-  auto const& nf = _server.getFeature<arangodb::NetworkFeature>();
+  auto const& nf = server().getFeature<arangodb::NetworkFeature>();
   network::ConnectionPool* cp = nf.pool();
 
   // _lastSent only accessed in main thread
@@ -694,7 +693,7 @@ void Agent::sendAppendEntriesRPC() {
       }
       index_t lowest = unconfirmed.front().index;
 
-      Store snapshot(_server, this, "snapshot");
+      Store snapshot(server(), this, "snapshot");
       index_t snapshotIndex;
       term_t snapshotTerm;
 
@@ -860,7 +859,7 @@ void Agent::sendEmptyAppendEntriesRPC(std::string const& followerId) {
 
   index_t commitIndex = _commitIndex.load(std::memory_order_relaxed);
 
-  auto const& nf = _server.getFeature<arangodb::NetworkFeature>();
+  auto const& nf = server().getFeature<arangodb::NetworkFeature>();
   network::ConnectionPool* cp = nf.pool();
 
   // Send request
@@ -1060,8 +1059,8 @@ void Agent::activateAgency() {
 /// Load persistent state called once
 void Agent::load() {
   arangodb::SystemDatabaseFeature::ptr vocbase =
-      _server.hasFeature<SystemDatabaseFeature>()
-          ? _server.getFeature<SystemDatabaseFeature>().use()
+      server().hasFeature<SystemDatabaseFeature>()
+          ? server().getFeature<SystemDatabaseFeature>().use()
           : nullptr;
   if (vocbase == nullptr) {
     LOG_TOPIC("63e36", FATAL, Logger::AGENCY)
@@ -2387,7 +2386,7 @@ void Agent::emptyCbTrashBin() {
 }
 
 query_t Agent::buildDB(arangodb::consensus::index_t index) {
-  Store store(_server, this);
+  Store store(server(), this);
   index_t oldIndex;
   term_t term;
   if (!_state.loadLastCompactedSnapshot(store, oldIndex, term)) {

diff --git a/arangod/Agency/Agent.h b/arangod/Agency/Agent.h
@@ -36,18 +36,19 @@
 #include "Futures/Promise.h"
 #include "Basics/ConditionLocker.h"
 #include "Basics/ReadWriteLock.h"
+#include "RestServer/arangod.h"
 #include "Metrics/Fwd.h"
 
 struct TRI_vocbase_t;
 
 namespace arangodb {
 namespace consensus {
 
-class Agent final : public arangodb::Thread, public AgentInterface {
+class Agent final : public arangodb::ServerThread<ArangodServer>,
+                    public AgentInterface {
  public:
   /// @brief Construct with program options
-  explicit Agent(application_features::ApplicationServer& server,
-                 config_t const&);
+  explicit Agent(ArangodServer& server, config_t const&);
 
   /// @brief Clean up
   ~Agent();

diff --git a/arangod/Agency/AsyncAgencyComm.cpp b/arangod/Agency/AsyncAgencyComm.cpp
@@ -552,12 +552,9 @@ void AsyncAgencyCommManager::reportRedirect(std::string const& endpoint,
   }
 }
 
-application_features::ApplicationServer& AsyncAgencyCommManager::server() {
-  return _server;
-}
+ArangodServer& AsyncAgencyCommManager::server() { return _server; }
 
-AsyncAgencyCommManager::AsyncAgencyCommManager(
-    application_features::ApplicationServer& server)
+AsyncAgencyCommManager::AsyncAgencyCommManager(ArangodServer& server)
     : _server(server) {}
 
 const char* AGENCY_URL_READ = "/_api/agency/read";