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

Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-09-06 15:41:37 +02:00
parent aa64e86d72 6adc95ddce
commit 3ad8063283
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -965,21 +965,28 @@ function tryLaunchJob () {
if (jobs.running === null) { if (jobs.running === null) {
var shards = Object.keys(jobs.scheduled).sort(); var shards = Object.keys(jobs.scheduled).sort();
if (shards.length > 0) { if (shards.length > 0) {
var jobInfo = jobs.scheduled[shards[0]]; var done = false;
try { while (!done) {
registerTask({ var jobInfo = jobs.scheduled[shards[0]];
database: jobInfo.database, try {
params: {database: jobInfo.database, shard: jobInfo.shard, registerTask({
planId: jobInfo.planId, leader: jobInfo.leader}, database: jobInfo.database,
command: function (params) { params: {database: jobInfo.database, shard: jobInfo.shard,
require('@arangodb/cluster').synchronizeOneShard( planId: jobInfo.planId, leader: jobInfo.leader},
params.database, params.shard, params.planId, params.leader); command: function (params) {
}}); require('@arangodb/cluster').synchronizeOneShard(
} catch (err) { params.database, params.shard, params.planId, params.leader);
if (!require('internal').isStopping()) { }});
console.error('Could not registerTask for shard synchronization.'); done = true;
} catch (err) {
if (!require('internal').isStopping()) {
console.error('Could not registerTask for shard synchronization.',
err);
wait(1.0);
} else {
done = true;
}
} }
return;
} }
global.KEY_SET('shardSynchronization', 'running', jobInfo); global.KEY_SET('shardSynchronization', 'running', jobInfo);
console.debug('scheduleOneShardSynchronization: have launched job', jobInfo); console.debug('scheduleOneShardSynchronization: have launched job', jobInfo);