Fix: only set INTERMEDIATE_COMMIT hint for follower trx if intermedia…

…teCommitSize/Count are set properly
arangodb · jsteemann · Aug 31, 2021 · Jun 8, 2021 · Jun 8, 2021 · Jun 8, 2021
commit 0e4bc2bb8ac1092ece918f1bb4f62cb73f2699d0
diff --git a/arangod/Transaction/Manager.cpp b/arangod/Transaction/Manager.cpp
@@ -379,9 +379,11 @@ transaction::Hints Manager::ensureHints(transaction::Options& options) const {
   hints.set(transaction::Hints::Hint::GLOBAL_MANAGED);
   if (isFollowerTransactionOnDBServer(options)) {
     hints.set(transaction::Hints::Hint::IS_FOLLOWER_TRX);
-    // turn on intermediate commits on followers as well. otherwise huge leader
-    // transactions could make the follower claim all memory and crash.
-    hints.set(transaction::Hints::Hint::INTERMEDIATE_COMMITS);
+    if (options.isIntermediateCommitEnabled()) {
+      // turn on intermediate commits on followers as well. otherwise huge leader
      // transactions could make the follower claim all memory and crash.
+      hints.set(transaction::Hints::Hint::INTERMEDIATE_COMMITS);
+    }
   }
   return hints;
 }

diff --git a/tests/js/client/shell/shell-iterators.js b/tests/js/client/shell/shell-iterators.js
@@ -358,7 +358,7 @@ function IteratorSuite(permuteConfigs) {
         // full scan using edge index and a filter
         let result = ctx.query(`
           FOR doc IN @@c
-          FILTER doc._from == "${cn}/blubb" AND doc._to > "${cn}/test00001" AND doc._to <= "${cn}/test04995"
+            FILTER doc._from == "${cn}/blubb" AND doc._to > "${cn}/test00001" AND doc._to <= "${cn}/test04995"
             INSERT { _from: "${cn}/blubb", _to: CONCAT("y", doc._to) } INTO @@c
             SORT doc._to ASC
             RETURN doc`,