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 devel

This commit is contained in:
Andreas Streichardt 2016-06-06 13:21:02 +02:00
parent bfbff59ae8 442c7d0390
commit 408def02ab
8 changed files with 91 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Cluster/ClusterComm.cpp
View File

@ -1131,7 +1131,11 @@ size_t ClusterComm::performRequests(std::vector<ClusterCommRequest>& requests,
continue; continue;
} }
auto it = opIDtoIndex.find(res.operationID); auto it = opIDtoIndex.find(res.operationID);
TRI_ASSERT(it != opIDtoIndex.end()); // we should really know this! if (it == opIDtoIndex.end()) {
// Ooops, we got a response to which we did not send the request
LOG(ERR) << "Received ClusterComm response for a request we did not send!";
continue;
}
size_t index = it->second; size_t index = it->second;
if (res.status == CL_COMM_RECEIVED) { if (res.status == CL_COMM_RECEIVED) {
requests[index].result = res; requests[index].result = res;

30
arangod/Cluster/v8-cluster.cpp
View File

@ -1852,7 +1852,7 @@ static void JS_Drop(v8::FunctionCallbackInfo<v8::Value> const& args) {
TRI_V8_CURRENT_GLOBALS_AND_SCOPE; TRI_V8_CURRENT_GLOBALS_AND_SCOPE;
if (args.Length() != 1) { if (args.Length() != 1) {
TRI_V8_THROW_EXCEPTION_USAGE("wait(obj)"); TRI_V8_THROW_EXCEPTION_USAGE("drop(obj)");
} }
// Possible options: // Possible options:
// - clientTransactionID (string) // - clientTransactionID (string)
@ -1860,14 +1860,6 @@ static void JS_Drop(v8::FunctionCallbackInfo<v8::Value> const& args) {
// - operationID (number) // - operationID (number)
// - shardID (string) // - shardID (string)
// Disabled to allow communication originating in a DBserver:
// 31.7.2014 Max
// if (ServerState::instance()->getRole() != ServerState::ROLE_COORDINATOR) {
// TRI_V8_THROW_EXCEPTION_INTERNAL(scope,"request works only in coordinator
// role");
// }
ClusterComm* cc = ClusterComm::instance(); ClusterComm* cc = ClusterComm::instance();
if (cc == nullptr) { if (cc == nullptr) {
@ -1911,6 +1903,25 @@ static void JS_Drop(v8::FunctionCallbackInfo<v8::Value> const& args) {
TRI_V8_TRY_CATCH_END TRI_V8_TRY_CATCH_END
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief get an ID for use with coordTransactionId
////////////////////////////////////////////////////////////////////////////////
static void JS_GetId(v8::FunctionCallbackInfo<v8::Value> const& args) {
TRI_V8_TRY_CATCH_BEGIN(isolate);
if (args.Length() != 0) {
TRI_V8_THROW_EXCEPTION_USAGE("getId()");
}
auto id = TRI_NewTickServer();
std::string st = StringUtils::itoa(id);
v8::Handle<v8::String> s = TRI_V8_ASCII_STRING(st.c_str());
TRI_V8_RETURN(s);
TRI_V8_TRY_CATCH_END
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief creates a global cluster context /// @brief creates a global cluster context
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -2106,6 +2117,7 @@ void TRI_InitV8Cluster(v8::Isolate* isolate, v8::Handle<v8::Context> context) {
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("enquire"), JS_Enquire); TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("enquire"), JS_Enquire);
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("wait"), JS_Wait); TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("wait"), JS_Wait);
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("drop"), JS_Drop); TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("drop"), JS_Drop);
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("getId"), JS_GetId);
v8g->ClusterCommTempl.Reset(isolate, rt); v8g->ClusterCommTempl.Reset(isolate, rt);
TRI_AddGlobalFunctionVocbase(isolate, context, TRI_AddGlobalFunctionVocbase(isolate, context,

6
js/actions/api-cluster.js
View File

@ -194,8 +194,7 @@ actions.defineHttp({
return; return;
} }
var DBserver = req.parameters.DBserver; var DBserver = req.parameters.DBserver;
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var options = { timeout:10 };
var options = { coordTransactionID: coord.coordTransactionID, timeout:10 };
var op = ArangoClusterComm.asyncRequest("GET","server:"+DBserver,"_system", var op = ArangoClusterComm.asyncRequest("GET","server:"+DBserver,"_system",
"/_admin/statistics","",{},options); "/_admin/statistics","",{},options);
var r = ArangoClusterComm.wait(op); var r = ArangoClusterComm.wait(op);
@ -343,8 +342,7 @@ actions.defineHttp({
} }
else { else {
// query a remote statistics collection // query a remote statistics collection
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var options = { timeout:10 };
var options = { coordTransactionID: coord.coordTransactionID, timeout:10 };
var op = ArangoClusterComm.asyncRequest("POST","server:"+DBserver,"_system", var op = ArangoClusterComm.asyncRequest("POST","server:"+DBserver,"_system",
"/_api/cursor",JSON.stringify({query: myQueryVal, bindVars: bind}),{},options); "/_api/cursor",JSON.stringify({query: myQueryVal, bindVars: bind}),{},options);
var r = ArangoClusterComm.wait(op); var r = ArangoClusterComm.wait(op);

3
js/apps/system/_admin/aardvark/APP/statistics.js
View File

@ -443,8 +443,7 @@ router.get("/cluster", function (req, res) {
const DBserver = req.queryParams.DBserver; const DBserver = req.queryParams.DBserver;
let type = req.queryParams.type; let type = req.queryParams.type;
const coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; const options = { timeout: 10 };
const options = { coordTransactionID: coord.coordTransactionID, timeout: 10 };
if (type !== "short" && type !== "long") { if (type !== "short" && type !== "long") {
type = "short"; type = "short";

12
js/server/modules/@arangodb/arango-collection.js
View File

@ -1,5 +1,5 @@
/*jshint strict: false */ /*jshint strict: false */
/*global ArangoClusterComm, ArangoClusterInfo, require, exports, module */ /*global ArangoClusterComm, require, exports, module */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief ArangoCollection /// @brief ArangoCollection
@ -135,7 +135,7 @@ ArangoCollection.prototype.truncate = function () {
} }
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this.name()); var shards = cluster.shardList(dbName, this.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
shards.forEach(function (shard) { shards.forEach(function (shard) {
@ -259,7 +259,7 @@ ArangoCollection.prototype.any = function () {
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this.name()); var shards = cluster.shardList(dbName, this.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
shards.forEach(function (shard) { shards.forEach(function (shard) {
@ -356,7 +356,7 @@ ArangoCollection.prototype.removeByExample = function (example,
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this.name()); var shards = cluster.shardList(dbName, this.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
if (limit > 0 && shards.length > 1) { if (limit > 0 && shards.length > 1) {
@ -443,7 +443,7 @@ ArangoCollection.prototype.replaceByExample = function (example,
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this.name()); var shards = cluster.shardList(dbName, this.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
if (limit > 0 && shards.length > 1) { if (limit > 0 && shards.length > 1) {
@ -542,7 +542,7 @@ ArangoCollection.prototype.updateByExample = function (example,
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this.name()); var shards = cluster.shardList(dbName, this.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
if (limit > 0 && shards.length > 1) { if (limit > 0 && shards.length > 1) {

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

@ -1355,51 +1355,54 @@ var shardList = function (dbName, collectionName) {
var waitForDistributedResponse = function (data, shards) { var waitForDistributedResponse = function (data, shards) {
var received = [ ]; var received = [ ];
try {
while (received.length < shards.length) { while (received.length < shards.length) {
var result = global.ArangoClusterComm.wait(data); var result = global.ArangoClusterComm.wait(data);
var status = result.status; var status = result.status;
if (status === "ERROR") { if (status === "ERROR") {
raiseError(arangodb.errors.ERROR_INTERNAL.code, raiseError(arangodb.errors.ERROR_INTERNAL.code,
"received an error from a DB server: " + JSON.stringify(result)); "received an error from a DB server: " + JSON.stringify(result));
} }
else if (status === "TIMEOUT") { else if (status === "TIMEOUT") {
raiseError(arangodb.errors.ERROR_CLUSTER_TIMEOUT.code, raiseError(arangodb.errors.ERROR_CLUSTER_TIMEOUT.code,
arangodb.errors.ERROR_CLUSTER_TIMEOUT.message); arangodb.errors.ERROR_CLUSTER_TIMEOUT.message);
} }
else if (status === "DROPPED") { else if (status === "DROPPED") {
raiseError(arangodb.errors.ERROR_INTERNAL.code, raiseError(arangodb.errors.ERROR_INTERNAL.code,
"the operation was dropped"); "the operation was dropped");
} }
else if (status === "RECEIVED") { else if (status === "RECEIVED") {
received.push(result); received.push(result);
if (result.headers && result.headers.hasOwnProperty('x-arango-response-code')) { if (result.headers && result.headers.hasOwnProperty('x-arango-response-code')) {
var code = parseInt(result.headers['x-arango-response-code'].substr(0, 3), 10); var code = parseInt(result.headers['x-arango-response-code'].substr(0, 3), 10);
if (code >= 400) { if (code >= 400) {
var body; var body;
try { try {
body = JSON.parse(result.body); body = JSON.parse(result.body);
}
catch (err) {
raiseError(arangodb.errors.ERROR_INTERNAL.code,
"error parsing JSON received from a DB server: " + err.message);
}
raiseError(body.errorNum,
body.errorMessage);
} }
catch (err) {
raiseError(arangodb.errors.ERROR_INTERNAL.code,
"error parsing JSON received from a DB server: " + err.message);
}
raiseError(body.errorNum,
body.errorMessage);
} }
} }
else {
// something else... wait without GC
require("internal").wait(0.1, false);
}
} }
else { } finally {
// something else... wait without GC global.ArangoClusterComm.drop(data);
require("internal").wait(0.1, false);
}
} }
return received; return received;
}; };
@ -1543,7 +1546,7 @@ var bootstrapDbServers = function (isRelaunch) {
var i; var i;
var options = { var options = {
coordTransactionID: global.ArangoClusterInfo.uniqid(), coordTransactionID: global.ArangoClusterComm.getId(),
timeout: 90 timeout: 90
}; };

20
js/server/modules/@arangodb/foxx/manager.js
View File

@ -616,7 +616,7 @@ function createService(mount, options, activateDevelopment) {
function uploadToPeerCoordinators(serviceInfo, coordinators) { function uploadToPeerCoordinators(serviceInfo, coordinators) {
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
let req = fs.readBuffer(joinPath(fs.getTempPath(), serviceInfo)); let req = fs.readBuffer(joinPath(fs.getTempPath(), serviceInfo));
let httpOptions = {}; let httpOptions = {};
@ -1159,7 +1159,7 @@ function install(serviceInfo, mount, options) {
let intOpts = JSON.parse(JSON.stringify(options)); let intOpts = JSON.parse(JSON.stringify(options));
intOpts.__clusterDistribution = true; intOpts.__clusterDistribution = true;
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
let httpOptions = {}; let httpOptions = {};
for (let i = 0; i < res.length; ++i) { for (let i = 0; i < res.length; ++i) {
@ -1177,7 +1177,7 @@ function install(serviceInfo, mount, options) {
/*jshint -W075:false */ /*jshint -W075:false */
let httpOptions = {}; let httpOptions = {};
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
req.options.__clusterDistribution = true; req.options.__clusterDistribution = true;
req = JSON.stringify(req); req = JSON.stringify(req);
@ -1187,6 +1187,7 @@ function install(serviceInfo, mount, options) {
'/_admin/foxx/install', req, httpOptions, coordOptions); '/_admin/foxx/install', req, httpOptions, coordOptions);
} }
} }
cluster.wait(coordOptions, coordinators);
} }
} }
reloadRouting(); reloadRouting();
@ -1283,7 +1284,7 @@ function uninstall(mount, options) {
/*jshint -W075:false */ /*jshint -W075:false */
let httpOptions = {}; let httpOptions = {};
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
req.options.__clusterDistribution = true; req.options.__clusterDistribution = true;
req.options.force = true; req.options.force = true;
@ -1294,6 +1295,7 @@ function uninstall(mount, options) {
'/_admin/foxx/uninstall', req, httpOptions, coordOptions); '/_admin/foxx/uninstall', req, httpOptions, coordOptions);
} }
} }
cluster.wait(coordOptions, coordinators);
} }
reloadRouting(); reloadRouting();
return service.simpleJSON(); return service.simpleJSON();
@ -1327,7 +1329,7 @@ function replace(serviceInfo, mount, options) {
let intOpts = JSON.parse(JSON.stringify(options)); let intOpts = JSON.parse(JSON.stringify(options));
intOpts.__clusterDistribution = true; intOpts.__clusterDistribution = true;
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
let httpOptions = {}; let httpOptions = {};
for (let i = 0; i < res.length; ++i) { for (let i = 0; i < res.length; ++i) {
@ -1346,7 +1348,7 @@ function replace(serviceInfo, mount, options) {
/*jshint -W075:false */ /*jshint -W075:false */
let httpOptions = {}; let httpOptions = {};
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
req.options.__clusterDistribution = true; req.options.__clusterDistribution = true;
req.options.force = true; req.options.force = true;
@ -1355,6 +1357,7 @@ function replace(serviceInfo, mount, options) {
ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(), ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(),
'/_admin/foxx/replace', req, httpOptions, coordOptions); '/_admin/foxx/replace', req, httpOptions, coordOptions);
} }
cluster.wait(coordOptions, coordinators);
} }
} }
_uninstall(mount, {teardown: true, _uninstall(mount, {teardown: true,
@ -1394,7 +1397,7 @@ function upgrade(serviceInfo, mount, options) {
let intOpts = JSON.parse(JSON.stringify(options)); let intOpts = JSON.parse(JSON.stringify(options));
intOpts.__clusterDistribution = true; intOpts.__clusterDistribution = true;
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
let httpOptions = {}; let httpOptions = {};
for (let i = 0; i < res.length; ++i) { for (let i = 0; i < res.length; ++i) {
@ -1413,7 +1416,7 @@ function upgrade(serviceInfo, mount, options) {
/*jshint -W075:false */ /*jshint -W075:false */
let httpOptions = {}; let httpOptions = {};
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterInfo.uniqid() coordTransactionID: ArangoClusterComm.getId()
}; };
req.options.__clusterDistribution = true; req.options.__clusterDistribution = true;
req.options.force = true; req.options.force = true;
@ -1422,6 +1425,7 @@ function upgrade(serviceInfo, mount, options) {
ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(), ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(),
'/_admin/foxx/update', req, httpOptions, coordOptions); '/_admin/foxx/update', req, httpOptions, coordOptions);
} }
cluster.wait(coordOptions, coordinators);
} }
} }
var oldService = lookupService(mount); var oldService = lookupService(mount);

10
js/server/modules/@arangodb/simple-query.js
View File

@ -1,5 +1,5 @@
/*jshint strict: false */ /*jshint strict: false */
/*global ArangoClusterComm, ArangoClusterInfo */ /*global ArangoClusterComm */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief Arango Simple Query Language /// @brief Arango Simple Query Language
@ -219,7 +219,7 @@ SimpleQueryNear.prototype.execute = function () {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this._collection.name()); var shards = cluster.shardList(dbName, this._collection.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
var _limit = 0; var _limit = 0;
@ -343,7 +343,7 @@ SimpleQueryWithin.prototype.execute = function () {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this._collection.name()); var shards = cluster.shardList(dbName, this._collection.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
var _limit = 0; var _limit = 0;
@ -460,7 +460,7 @@ SimpleQueryFulltext.prototype.execute = function () {
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this._collection.name()); var shards = cluster.shardList(dbName, this._collection.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
var _limit = 0; var _limit = 0;
if (this._limit > 0) { if (this._limit > 0) {
@ -547,7 +547,7 @@ SimpleQueryWithinRectangle.prototype.execute = function () {
if (cluster.isCoordinator()) { if (cluster.isCoordinator()) {
var dbName = require("internal").db._name(); var dbName = require("internal").db._name();
var shards = cluster.shardList(dbName, this._collection.name()); var shards = cluster.shardList(dbName, this._collection.name());
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterComm.getId() };
var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 }; var options = { coordTransactionID: coord.coordTransactionID, timeout: 360 };
var _limit = 0; var _limit = 0;
if (this._limit > 0) { if (this._limit > 0) {