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

cloned options (#2819)

This commit is contained in:
Frank Celler 2017-07-17 17:36:24 +02:00 committed by GitHub
parent b0a958ae0c
commit ba276467c0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,8 +919,9 @@ function startInstanceCluster (instanceInfo, protocol, options,
httpOptions.returnBodyOnError = true;
// scrape the jwt token
if (addArgs['server.jwt-secret'] && !options['server.jwt-secret']) {
options['server.jwt-secret'] = addArgs['server.jwt-secret'];
let authOpts = _.clone(options);
if (addArgs['server.jwt-secret'] && !authOpts['server.jwt-secret']) {
authOpts['server.jwt-secret'] = addArgs['server.jwt-secret'];
}
let count = 0;
@ -935,8 +936,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
throw new Error('cluster startup timed out! bailing out!');
}
instanceInfo.arangods.forEach(arangod => {
const reply = download(arangod.url + '/_api/version', '', makeAuthorizationHeaders(options));
// accept a 401 or a 200 response as a 'upAndRunning' server
const reply = download(arangod.url + '/_api/version', '', makeAuthorizationHeaders(authOpts));
if (!reply.error && reply.code === 200) {
arangod.upAndRunning = true;
return true;
@ -963,6 +963,13 @@ function startInstanceCluster (instanceInfo, protocol, options,
if (upAndRunning === instanceInfo.arangods.length) {
break;
}
// Didn't startup in 10 minutes? kill it, give up.
if (count > 1200) {
killExternal(instanceInfo.pid, abortSignal);
analyzeServerCrash(instanceInfo, options, 'startup timeout; forcefully terminating ' + instanceInfo.role + ' with pid: ' + instanceInfo.pid);
throw new Error("startup timed out!");
}
}
arango.reconnect(instanceInfo.endpoint, '_system', 'root', '');
return true;

7
js/client/modules/@arangodb/test-utils.js
View File

@ -253,10 +253,11 @@ function performTests (options, testList, testname, runFn, serverOptions, startS
}
// pass on JWT secret
if (serverOptions['server.jwt-secret'] && !options['server.jwt-secret']) {
options['server.jwt-secret'] = serverOptions['server.jwt-secret'];
let clonedOpts = _.clone(options);
if (serverOptions['server.jwt-secret'] && !clonedOpts['server.jwt-secret']) {
clonedOpts['server.jwt-secret'] = serverOptions['server.jwt-secret'];
}
pu.shutdownInstance(instanceInfo, options, forceTerminate);
pu.shutdownInstance(instanceInfo, clonedOpts, forceTerminate);
if (startStopHandlers !== undefined && startStopHandlers.hasOwnProperty('postStop')) {
customInstanceInfos['postStop'] = startStopHandlers.postStop(options,