change feature order so that ServerIdFeature is before ReplicationFea…

…ture (#13743)
arangodb · Mar 18, 2021 · 48dba7d · 48dba7d
1 parent 3aacae4
commit 48dba7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,13 @@
 devel
 -----
 
+* Make ReplicationFeature formally depend on ServerIdFeature, because the
+  former relies on the server id being already loaded by the latter.
+  If this dependency is not established properly, it is undefined if the
+  ReplicationFeature starts earlier than the ServerIdFeature, which can lead
+  to the ReplicationFeature not sending its server id properly to the leader
+  when doing replication between two single servers.
+
 * Fix potentially undefined behavior when creating a CalculationTransactionContext
   for an arangosearch analyzer. An uninitialized struct member was passed as an
   argument to its base class. This potentially had no observable effects, but

diff --git a/arangod/Replication/ReplicationFeature.cpp b/arangod/Replication/ReplicationFeature.cpp
@@ -39,6 +39,7 @@
 #include "Rest/GeneralResponse.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/MetricsFeature.h"
+#include "RestServer/ServerIdFeature.h"
 #include "RestServer/SystemDatabaseFeature.h"
 #include "StorageEngine/StorageEngineFeature.h"
 #include "VocBase/vocbase.h"
@@ -97,6 +98,7 @@ ReplicationFeature::ReplicationFeature(ApplicationServer& server)
   startsAfter<BasicFeaturePhaseServer>();
 
   startsAfter<DatabaseFeature>();
+  startsAfter<ServerIdFeature>();
   startsAfter<StorageEngineFeature>();
   startsAfter<SystemDatabaseFeature>();
 }