From 7813c76f323fe3e3d7833dcb7ad58c7facafc60e Mon Sep 17 00:00:00 2001
From: Jan <jsteemann@users.noreply.github.com>
Date: Mon, 29 Jul 2019 15:32:08 +0200
Subject: [PATCH] Bug fix 3.5/fix replication failures (#9591)

* fix wrong string constant

* fix load balancing tests for mmfiles

* remove print

* try to fix mmfiles test
---
 arangod/RestHandler/RestReplicationHandler.cpp         |  2 +-
 .../load-balancing-transactions-auth-cluster.js        | 10 ++++++----
 .../load-balancing-transactions-noauth-cluster.js      | 10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp
index 06b0d6f4f0..8c6b3b381b 100644
--- a/arangod/RestHandler/RestReplicationHandler.cpp
+++ b/arangod/RestHandler/RestReplicationHandler.cpp
@@ -211,7 +211,7 @@ std::string const RestReplicationHandler::LoggerTickRanges =
 std::string const RestReplicationHandler::LoggerFirstTick = "logger-first-tick";
 std::string const RestReplicationHandler::LoggerFollow = "logger-follow";
 std::string const RestReplicationHandler::OpenTransactions =
-    "determiconst ne-open-transactions";
+    "determine-open-transactions";
 std::string const RestReplicationHandler::Batch = "batch";
 std::string const RestReplicationHandler::Barrier = "barrier";
 std::string const RestReplicationHandler::Inventory = "inventory";
diff --git a/tests/js/client/load-balancing/load-balancing-transactions-auth-cluster.js b/tests/js/client/load-balancing/load-balancing-transactions-auth-cluster.js
index d53226cf3b..f18d3b5859 100644
--- a/tests/js/client/load-balancing/load-balancing-transactions-auth-cluster.js
+++ b/tests/js/client/load-balancing/load-balancing-transactions-auth-cluster.js
@@ -129,6 +129,8 @@ function TransactionsSuite () {
       userModule.grantDatabase(users[1].username, '_system', 'rw');
       userModule.grantCollection(users[0].username, '_system', cn, 'rw');
       userModule.grantCollection(users[1].username, '_system', cn, 'rw');
+      
+      require("internal").wait(2);
     },
 
     tearDown: function() {
@@ -139,7 +141,7 @@ function TransactionsSuite () {
     },
 
     testListTransactions: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest(users[0], 'POST', url + "/begin", obj, true);
@@ -165,7 +167,7 @@ function TransactionsSuite () {
     },
     
     testListTransactions2: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let trx1, trx2;
@@ -221,7 +223,7 @@ function TransactionsSuite () {
     },
     
     testCreateAndCommitElsewhere: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest(users[0], 'POST', url + "/begin", obj, true);
@@ -247,7 +249,7 @@ function TransactionsSuite () {
     },
     
     testCreateAndAbortElsewhere: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest(users[0], 'POST', url + "/begin", obj, true);
diff --git a/tests/js/client/load-balancing/load-balancing-transactions-noauth-cluster.js b/tests/js/client/load-balancing/load-balancing-transactions-noauth-cluster.js
index 90d3c338fd..abee220644 100644
--- a/tests/js/client/load-balancing/load-balancing-transactions-noauth-cluster.js
+++ b/tests/js/client/load-balancing/load-balancing-transactions-noauth-cluster.js
@@ -107,6 +107,8 @@ function TransactionsSuite () {
 
       db._drop(cn);
       db._create(cn);
+
+      require("internal").wait(2);
     },
 
     tearDown: function() {
@@ -115,7 +117,7 @@ function TransactionsSuite () {
     },
 
     testListTransactions: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest('POST', url + "/begin", obj, true);
@@ -141,7 +143,7 @@ function TransactionsSuite () {
     },
     
     testListTransactions2: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let trx1, trx2;
@@ -197,7 +199,7 @@ function TransactionsSuite () {
     },
     
     testCreateAndCommitElsewhere: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest('POST', url + "/begin", obj, true);
@@ -223,7 +225,7 @@ function TransactionsSuite () {
     },
     
     testCreateAndAbortElsewhere: function() {
-      const obj = { collections: { write: cn } };
+      const obj = { collections: { read: cn } };
 
       let url = "/_api/transaction";
       let result = sendRequest('POST', url + "/begin", obj, true);