Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jan 2019-07-29 15:32:08 +02:00 committed by KVS85
parent d9057ad695
commit 7813c76f32
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -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";

10
tests/js/client/load-balancing/load-balancing-transactions-auth-cluster.js
View File

@ -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);

10
tests/js/client/load-balancing/load-balancing-transactions-noauth-cluster.js
View File

@ -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);