Bug fix/increase replication timeouts (arangodb#6740)

jsteemann · web-flow · commit 9b6d526942e7 · 2018-10-08T09:40:38.000+02:00
diff --git a/arangod/MMFiles/MMFilesRestReplicationHandler.cpp b/arangod/MMFiles/MMFilesRestReplicationHandler.cpp
@@ -186,7 +186,7 @@ void MMFilesRestReplicationHandler::handleCommandBarrier() {
 
     // extract ttl
     double ttl =
-        VelocyPackHelper::getNumericValue<double>(input->slice(), "ttl", 30.0);
+        VelocyPackHelper::getNumericValue<double>(input->slice(), "ttl", replutils::BarrierInfo::DefaultTimeout);
 
     TRI_voc_tick_t minTick = 0;
     VPackSlice const v = input->slice().get("tick");
@@ -230,7 +230,7 @@ void MMFilesRestReplicationHandler::handleCommandBarrier() {
 
     // extract ttl
     double ttl =
-        VelocyPackHelper::getNumericValue<double>(input->slice(), "ttl", 30.0);
+        VelocyPackHelper::getNumericValue<double>(input->slice(), "ttl", replutils::BarrierInfo::DefaultTimeout);
 
     TRI_voc_tick_t minTick = 0;
     VPackSlice const v = input->slice().get("tick");
@@ -667,7 +667,7 @@ void MMFilesRestReplicationHandler::handleCommandCreateKeys() {
 
   // initialize a container with the keys
   auto keys = std::make_unique<MMFilesCollectionKeys>(
-    _vocbase, std::move(guard), id, 300.0
+    _vocbase, std::move(guard), id, 900.0
   );
 
   std::string const idString(std::to_string(keys->id()));
diff --git a/arangod/Replication/utilities.h b/arangod/Replication/utilities.h
@@ -101,10 +101,11 @@ struct ProgressInfo {
 };
 
 struct BarrierInfo {
+  static constexpr double DefaultTimeout = 900.0;
   /// @brief WAL barrier id
   uint64_t id{0};
   /// @brief ttl for WAL barrier
-  int ttl{600};
+  int ttl{static_cast<int>(DefaultTimeout)};
   /// @brief WAL barrier last update time
   double updateTime{0.0};
 
@@ -117,7 +118,7 @@ struct BarrierInfo {
 };
 
 struct BatchInfo {
-  static constexpr double DefaultTimeout = 300.0;
+  static constexpr double DefaultTimeout = 7200.0;
 
   /// @brief dump batch id
   uint64_t id{0};
