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

add some debugging for unstable replication_sync test (#6436)

This commit is contained in:
Jan 2018-09-10 14:46:50 +02:00 committed by GitHub
parent bc99ed2eca
commit 7a3c2bf6af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Replication/DatabaseInitialSyncer.cpp
View File

@ -249,7 +249,7 @@ Result DatabaseInitialSyncer::runWithInventory(bool incremental,
LOG_TOPIC(DEBUG, Logger::REPLICATION)
<< "initial synchronization with master took: "
<< Logger::FIXED(TRI_microtime() - startTime, 6)
<< " s. status: " << r.errorMessage();
<< " s. status: " << (r.errorMessage().empty() ? "all good" : r.errorMessage());
return r;
} catch (arangodb::basics::Exception const& ex) {

13
js/client/modules/@arangodb/process-utils.js
View File

@ -1309,10 +1309,11 @@ function startInstance (protocol, options, addArgs, testname, tmpDir) {
const startTime = time();
try {
if (options.hasOwnProperty('server')) {
let rc = { endpoint: options.server,
rootDir: options.serverRoot,
url: options.server.replace('tcp', 'http'),
arangods: []
let rc = {
endpoint: options.server,
rootDir: options.serverRoot,
url: options.server.replace('tcp', 'http'),
arangods: []
};
arango.reconnect(rc.endpoint, '_system', 'root', '');
return rc;
@ -1410,13 +1411,9 @@ exports.run = {
};
exports.shutdownInstance = shutdownInstance;
// exports.startInstanceCluster = startInstanceCluster;
exports.startArango = startArango;
// exports.startInstanceAgency = startInstanceAgency;
// exports.startInstanceSingleServer = startInstanceSingleServer;
exports.startInstance = startInstance;
exports.setupBinaries = setupBinaries;
exports.executableExt = executableExt;
exports.serverCrashed = serverCrashed;

8
js/client/modules/@arangodb/testsuites/replication.js
View File

@ -81,7 +81,7 @@ function replicationFuzz (options) {
customInstanceInfos,
startStopHandlers) {
let message;
let slave = pu.startInstance('tcp', options, {}, 'slave_sync');
let slave = pu.startInstance('tcp', options, {}, 'slave_fuzz');
let state = (typeof slave === 'object');
if (state) {
@ -140,7 +140,7 @@ function replicationRandom (options) {
customInstanceInfos,
startStopHandlers) {
let message;
let slave = pu.startInstance('tcp', options, {}, 'slave_sync');
let slave = pu.startInstance('tcp', options, {}, 'slave_random');
let state = (typeof slave === 'object');
if (state) {
@ -199,7 +199,7 @@ function replicationAql (options) {
customInstanceInfos,
startStopHandlers) {
let message;
let slave = pu.startInstance('tcp', options, {}, 'slave_sync');
let slave = pu.startInstance('tcp', options, {}, 'slave_aql');
let state = (typeof slave === 'object');
if (state) {
@ -410,7 +410,7 @@ function replicationSync (options) {
startStopHandlers) {
let message;
let res = true;
let slave = pu.startInstance('tcp', options, {}, 'slave_sync');
let slave = pu.startInstance('tcp', options, {"log.level" : "replication=trace", "--log.level": "replication=trace"}, 'slave_sync');
let state = (typeof slave === 'object');
if (state) {