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

Improve error messages.

This commit is contained in:
Max Neunhoeffer 2016-05-23 20:40:48 +02:00
parent e06c65a7a6
commit 7dec299c3a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/server/modules/@arangodb/cluster.js
View File

@ -94,6 +94,9 @@ function startReadLockOnLeader (endpoint, database, collName, timeout) {
} }
console.debug("startReadLockOnLeader: Do not see read lock yet..."); console.debug("startReadLockOnLeader: Do not see read lock yet...");
} }
var asyncJobId = rr.headers["x-arango-async-id"];
r = require({ url: url + "/_api/job/" + asyncJobId, body: "", method: "PUT"});
console.error("startReadLockOnLeader: giving up, async result:", r);
return false; return false;
} }
@ -956,6 +959,8 @@ function synchronizeLocalFollowerCollections (plannedCollections,
ok = false; ok = false;
} }
} }
} else {
console.error("lockJobId was false");
} }
if (ok) { if (ok) {
console.info("Synchronization worked for shard", shard); console.info("Synchronization worked for shard", shard);

8
js/server/tests/resilience/resilience-synchronous-repl-cluster.js
View File

@ -34,7 +34,6 @@ const arangodb = require("@arangodb");
const db = arangodb.db; const db = arangodb.db;
const ERRORS = arangodb.errors; const ERRORS = arangodb.errors;
const _ = require("lodash"); const _ = require("lodash");
const print = require("internal").print;
const wait = require("internal").wait; const wait = require("internal").wait;
const suspendExternal = require("internal").suspendExternal; const suspendExternal = require("internal").suspendExternal;
const continueExternal = require("internal").continueExternal; const continueExternal = require("internal").continueExternal;
@ -67,6 +66,7 @@ function SynchronousReplicationSuite () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function waitForSynchronousReplication(database) { function waitForSynchronousReplication(database) {
console.info("Waiting for synchronous replication to settle...");
cinfo = global.ArangoClusterInfo.getCollectionInfo(database, cn); cinfo = global.ArangoClusterInfo.getCollectionInfo(database, cn);
shards = Object.keys(cinfo.shards); shards = Object.keys(cinfo.shards);
var count = 0; var count = 0;
@ -76,7 +76,7 @@ function SynchronousReplicationSuite () {
); );
let replicas = ccinfo.map(s => s.servers.length); let replicas = ccinfo.map(s => s.servers.length);
if (_.all(replicas, x => x === 2)) { if (_.all(replicas, x => x === 2)) {
print("Replication up and running!"); console.info("Replication up and running!");
return true; return true;
} }
wait(0.5); wait(0.5);
@ -280,15 +280,11 @@ function SynchronousReplicationSuite () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
setUp : function () { setUp : function () {
console.error("Dumdidum");
var systemCollServers = findCollectionServers("_system", "_graphs"); var systemCollServers = findCollectionServers("_system", "_graphs");
console.error("Dumdidum");
while (true) { while (true) {
console.error("Dumdidei");
db._drop(cn); db._drop(cn);
c = db._create(cn, {numberOfShards: 1, replicationFactor: 2}); c = db._create(cn, {numberOfShards: 1, replicationFactor: 2});
var servers = findCollectionServers("_system", cn); var servers = findCollectionServers("_system", cn);
console.error("Dideldum:", systemCollServers, servers, _.intersection(systemCollServers, servers));
if (_.intersection(systemCollServers, servers).length === 0) { if (_.intersection(systemCollServers, servers).length === 0) {
return; return;
} }