Sandychuang
diff --git a/‎arangod/Cluster/ClusterFeature.cpp
Lines changed: 4 additions & 0 deletions b/‎arangod/Cluster/ClusterFeature.cpp
Lines changed: 4 additions & 0 deletions
diff --git a/‎arangod/Cluster/ClusterFeature.h
Lines changed: 4 additions & 2 deletions b/‎arangod/Cluster/ClusterFeature.h
Lines changed: 4 additions & 2 deletions
diff --git a/‎arangod/RestHandler/RestReplicationHandler.cpp
Lines changed: 3 additions & 1 deletion b/‎arangod/RestHandler/RestReplicationHandler.cpp
Lines changed: 3 additions & 1 deletion
diff --git a/‎arangod/VocBase/Methods/Indexes.cpp
Lines changed: 4 additions & 1 deletion b/‎arangod/VocBase/Methods/Indexes.cpp
Lines changed: 4 additions & 1 deletion
@@ -133,6 +133,10 @@ void ClusterFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
   options->addHiddenOption("--cluster.create-waits-for-sync-replication",
                      "active coordinator will wait for all replicas to create collection",
                      new BooleanParameter(&_createWaitsForSyncReplication));
+  
+  options->addHiddenOption("--cluster.index-create-timeout",
+                     "amount of time (in seconds) the coordinator will wait for an index to be created before giving up",
+                     new DoubleParameter(&_indexCreationTimeout));
 }
 
 void ClusterFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
 
@@ -50,7 +50,7 @@ class ClusterFeature : public application_features::ApplicationFeature {
     return _agencyEndpoints;
   }
 
-  std::string agencyPrefix() {
+  std::string agencyPrefix() const {
     return _agencyPrefix;
   }
 
@@ -61,6 +61,7 @@ class ClusterFeature : public application_features::ApplicationFeature {
   std::string _myAddress;
   uint32_t _systemReplicationFactor = 2;
   bool _createWaitsForSyncReplication = true;
+  double _indexCreationTimeout = 3600.0;
 
  private:
   void reportRole(ServerState::RoleEnum);
@@ -79,7 +80,8 @@ class ClusterFeature : public application_features::ApplicationFeature {
   };
 
   void setUnregisterOnShutdown(bool);
-  bool createWaitsForSyncReplication() { return _createWaitsForSyncReplication; };
+  bool createWaitsForSyncReplication() const { return _createWaitsForSyncReplication; };
+  double indexCreationTimeout() const { return _indexCreationTimeout; }
   uint32_t systemReplicationFactor() { return _systemReplicationFactor; };
 
   void stop() override final;
 
@@ -1651,6 +1651,8 @@ int RestReplicationHandler::processRestoreIndexesCoordinator(
     return TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND;
   }
   TRI_ASSERT(col != nullptr);
+  
+  auto cluster = application_features::ApplicationServer::getFeature<ClusterFeature>("Cluster");
 
   int res = TRI_ERROR_NO_ERROR;
   for (VPackSlice const& idxDef : VPackArrayIterator(indexes)) {
@@ -1671,7 +1673,7 @@ int RestReplicationHandler::processRestoreIndexesCoordinator(
       arangodb::Index::Compare,
       tmp,
       errorMsg,
-      3600.0
+      cluster->indexCreationTimeout()
     );
 
     if (res != TRI_ERROR_NO_ERROR) {
 
@@ -28,6 +28,7 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/conversions.h"
 #include "Basics/tri-strings.h"
+#include "Cluster/ClusterFeature.h"
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/ClusterMethods.h"
 #include "Cluster/ServerState.h"
@@ -309,9 +310,11 @@ Result Indexes::ensureIndexCoordinator(
   auto& dbName = collection->vocbase()->name();
   auto cid = std::to_string(collection->id());
   std::string errorMsg;
+
+  auto cluster = application_features::ApplicationServer::getFeature<ClusterFeature>("Cluster");
   int res = ClusterInfo::instance()->ensureIndexCoordinator(
       dbName, cid, indexDef, create, &arangodb::Index::Compare, resultBuilder,
-      errorMsg, 360.0);
+      errorMsg, cluster->indexCreationTimeout());
   return Result(res, errorMsg);
 }