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

fix dumping of agency, disable javascript in agency and dbserver (#8625)

This commit is contained in:
Wilfried Goesgens 2019-03-29 17:47:08 +01:00 committed by Jan
parent 531b55f225
commit ebb4de1e6a
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,23 +829,33 @@ function runArangoBenchmark (options, instanceInfo, cmds, rootDir, coreCheck = f
// / @brief dump the state of the agency to disk. if we still can get one.
// //////////////////////////////////////////////////////////////////////////////
function dumpAgency(instanceInfo, options) {
function dumpAgent(arangod, path, method, fn) {
let opts = {
method: method,
jwt: crypto.jwtEncode(instanceInfo.authOpts['server.jwt-secret'], {'server_id': 'none', 'iss': 'arangodb'}, 'HS256')
};
print('--------------------------------- '+ fn + ' -----------------------------------------------');
let agencyReply = download(arangod.url + path, method === 'POST' ? '[["/"]]' : '', opts);
if (agencyReply.code === 200) {
let agencyValue = JSON.parse(agencyReply.body);
print(JSON.stringify(agencyValue));
fs.write(fs.join(options.testOutputDirectory, fn + '_' + arangod.pid + ".json"), JSON.stringify(agencyValue, null, 2));
}
else {
print(agencyReply);
}
}
instanceInfo.arangods.forEach((arangod) => {
if (arangod.role === "agent") {
if (arangod.hasOwnProperty('exitStatus')) {
print(Date() + " this agent is already dead: " + arangod);
} else {
print(Date() + " Attempting to dump Agent: " + arangod);
let agencyConfig = arangod.GET('_api/agency/config');
print(JSON.stringify(agencyConfig));
fs.write(fs.join(options.testOutputDirectory, "agencyConfig_" + arangod.pid + ".json"), agencyConfig);
dumpAgent(arangod, '/_api/agency/config', 'GET', 'agencyConfig');
let agencyState = arangod.GET('_api/agency/state');
print(JSON.stringify(agencyState));
fs.write(fs.join(options.testOutputDirectory, "agencyState_" + arangod.pid + ".json"), agencyState);
dumpAgent(arangod, '/_api/agency/state', 'GET', 'agencyState');
let agencyPlan = arangod.GET('_api/agency/read');
print(JSON.stringify(agencyPlan));
fs.write(fs.join(options.testOutputDirectory, "agencyPlan_" + arangod.pid + ".json"), agencyPlan);
dumpAgent(arangod, '/_api/agency/read', 'POST', 'agencyPlan');
}
}
});
@ -1322,6 +1332,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
primaryArgs['cluster.my-address'] = endpoint;
primaryArgs['cluster.my-role'] = 'PRIMARY';
primaryArgs['cluster.agency-endpoint'] = agencyEndpoint;
primaryArgs['javascript.enabled'] = 'false';
startInstanceSingleServer(instanceInfo, protocol, options, ...makeArgs('dbserver' + i, 'dbserver', primaryArgs), 'dbserver');
}
@ -1516,6 +1527,7 @@ function startInstanceAgency (instanceInfo, protocol, options, addArgs, rootDir)
for (let i = 0; i < N; i++) {
let instanceArgs = _.clone(addArgs);
instanceArgs['log.file'] = fs.join(rootDir, 'log' + String(i));
instanceArgs['javascript.enabled'] = 'false';
instanceArgs['agency.activate'] = 'true';
instanceArgs['agency.size'] = String(N);
instanceArgs['agency.pool-size'] = String(N);