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

Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-01-23 12:32:05 +01:00
parent 952c3f848e bf296c3d24
commit f2360e1039
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arangod/Agency/AgencyComm.cpp
View File

@ -625,7 +625,7 @@ std::string AgencyCommManager::redirect(
_endpoints.end());
LOG_TOPIC(WARN, Logger::AGENCYCOMM)
<< "got an agency redirect from '" << endpoint
<< "Got an agency redirect from '" << endpoint
<< "' to '" << specification << "'";
_endpoints.push_front(specification);
@ -1365,26 +1365,7 @@ AgencyCommResult AgencyComm::sendWithFailover(
// break on a watch timeout (drop connection)
if (result._statusCode == 0) {
AgencyCommManager::MANAGER->failed(std::move(connection), endpoint);
endpoint.clear();
connection = AgencyCommManager::MANAGER->acquire(endpoint);
continue;
}
// sometimes the agency will return a 307 (temporary redirect)
// in this case we have to pick it up and use the new location returned
if (result._statusCode ==
(int)arangodb::rest::ResponseCode::TEMPORARY_REDIRECT) {
endpoint = AgencyCommManager::MANAGER->redirect(
std::move(connection), endpoint, result._location, url);
connection = AgencyCommManager::MANAGER->acquire(endpoint);
waitInterval = std::chrono::duration<double>(.25);
continue;
}
// Precondition failed.
if (result._statusCode == 412 && !clientId.empty()) {
VPackBuilder b;
{
VPackArrayBuilder ab(&b);
@ -1392,7 +1373,7 @@ AgencyCommResult AgencyComm::sendWithFailover(
}
LOG_TOPIC(INFO, Logger::AGENCYCOMM) <<
"Got precondition failed! Inquiring about clientId " << clientId << ": ";
"Failed agency comm! Inquiring about clientId " << clientId << ": ";
AgencyCommResult inq = send(
connection.get(), method, conTimeout, "/_api/agency/inquire",
@ -1439,9 +1420,24 @@ AgencyCommResult AgencyComm::sendWithFailover(
"with error. Keep trying ...";
return result;
}
AgencyCommManager::MANAGER->failed(std::move(connection), endpoint);
endpoint.clear();
connection = AgencyCommManager::MANAGER->acquire(endpoint);
continue;
}
// sometimes the agency will return a 307 (temporary redirect)
// in this case we have to pick it up and use the new location returned
if (result._statusCode ==
(int)arangodb::rest::ResponseCode::TEMPORARY_REDIRECT) {
endpoint = AgencyCommManager::MANAGER->redirect(
std::move(connection), endpoint, result._location, url);
connection = AgencyCommManager::MANAGER->acquire(endpoint);
waitInterval = std::chrono::duration<double>(.25);
continue;
}
// do not retry on client errors
if (result._statusCode >= 400 && result._statusCode <= 499) {
AgencyCommManager::MANAGER->release(std::move(connection), endpoint);

4
js/server/tests/aql/aql-optimizer-rule-use-index-for-sort.js
View File

@ -112,7 +112,7 @@ function optimizerRuleTestSuite() {
var loopto = 10;
internal.db._drop(colName);
skiplist = internal.db._create(colName, {numberOfShards: 4});
skiplist = internal.db._create(colName, {numberOfShards: 1});
var i, j;
for (j = 1; j <= loopto; ++j) {
for (i = 1; i <= loopto; ++i) {
@ -127,7 +127,7 @@ function optimizerRuleTestSuite() {
skiplist.ensureIndex({ type: "hash", fields: [ "c" ], unique: false });
internal.db._drop(colNameOther);
skiplist2 = internal.db._create(colNameOther, {numberOfShards: 4});
skiplist2 = internal.db._create(colNameOther, {numberOfShards: 1});
for (j = 1; j <= loopto; ++j) {
for (i = 1; i <= loopto; ++i) {
skiplist2.save({ "f" : i, "g": j , "h": j, "i": i, "j": i, "joinme" : "aoeu " + j});

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

@ -825,7 +825,6 @@ function SynchronousReplicationSuite () {
wait(5);
}
healLeader();
assertTrue(waitForSynchronousReplication("_system"));
},
////////////////////////////////////////////////////////////////////////////////