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

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
hkernbach 2016-10-04 15:43:38 +02:00
parent 6b0905314b 9d3214c539
commit 7865c6d695
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arangod/Agency/MoveShard.cpp
View File

@ -321,15 +321,17 @@ JOB_STATUS MoveShard::status() {
try { try {
_database = _snapshot(pos[status] + _jobId + "/database").getString(); _database = _snapshot(pos[status] + _jobId + "/database").getString();
_collection = _snapshot(pos[status] + _jobId + "/collections").slice()[0].copyString(); _collection =
_snapshot(pos[status] + _jobId + "/collections").slice()[0].copyString();
_from = _snapshot(pos[status] + _jobId + "/fromServer").getString(); _from = _snapshot(pos[status] + _jobId + "/fromServer").getString();
_to = _snapshot(pos[status] + _jobId + "/toServer").getString(); _to = _snapshot(pos[status] + _jobId + "/toServer").getString();
_shard = _snapshot(pos[status] + _jobId + "/shards").slice()[0].copyString(); _shard =
_snapshot(pos[status] + _jobId + "/shards").slice()[0].copyString();
} catch (std::exception const& e) { } catch (std::exception const& e) {
std::stringstream err; std::string err =
err << "Failed to find job " << _jobId << " in agency: " << e.what(); std::string("Failed to find job ") + _jobId + " in agency: " + e.what();
LOG_TOPIC(ERR, Logger::AGENCY) << err.str(); LOG_TOPIC(ERR, Logger::AGENCY) << err;
finish("Shards/" + _shard, false, err.str()); finish("Shards/" + _shard, false, err);
return FAILED; return FAILED;
} }
} }

1
arangod/V8Server/v8-collection.cpp
View File

@ -1159,6 +1159,7 @@ static void JS_PropertiesVocbaseCol(
TRI_V8_THROW_EXCEPTION_PARAMETER( TRI_V8_THROW_EXCEPTION_PARAMETER(
"indexBuckets must be a two-power between 1 and 1024"); "indexBuckets must be a two-power between 1 and 1024");
} }
int res = info->update(slice, false); int res = info->update(slice, false);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {

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

@ -298,14 +298,14 @@ function SynchronousReplicationSuite () {
c.remove([ids[0]._key, ids[1]._key]); c.remove([ids[0]._key, ids[1]._key]);
if (healing.place === 17) { healFailure(healing); } if (healing.place === 17) { healFailure(healing); }
if (failure.place === 18) { makeFailure(failure); } /* if (failure.place === 18) { makeFailure(failure); }
docs = c.document([ids[0]._key, ids[1]._key]); docs = c.document([ids[0]._key, ids[1]._key]);
assertEqual(2, docs.length); assertEqual(2, docs.length);
assertTrue(docs[0].error); assertTrue(docs[0].error);
assertTrue(docs[1].error); assertTrue(docs[1].error);
if (healing.place === 18) { healFailure(healing); } if (healing.place === 18) { healFailure(healing); }*/
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////