cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set pending to multiquery job when draining

Browse Source
This commit is contained in:
dgaubert 2016-03-31 15:11:35 +02:00
parent f95e8ef7f2
commit 270cdf8969
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
batch/job_canceller.js
View File

@ -48,7 +48,13 @@ JobCanceller.prototype.cancel = function (job_id, callback) {
var queryIndex = getIndexOfRunningQuery(job);
self.jobBackend.setCancelled(job, queryIndex, callback);
self.jobBackend.setCancelled(job, queryIndex, function (err, job) {
if (err) {
return callback(err);
}
callback(null, job, queryIndex);
});
});
});
});
@ -57,7 +63,7 @@ JobCanceller.prototype.cancel = function (job_id, callback) {
JobCanceller.prototype.drain = function (job_id, callback) {
var self = this;
this.cancel(job_id, function (err, job) {
this.cancel(job_id, function (err, job, queryIndex) {
if (err && err.name === 'CancelNotAllowedError') {
return callback(err);
}
@ -67,7 +73,7 @@ JobCanceller.prototype.drain = function (job_id, callback) {
return self.jobBackend.setUnknown(job_id, callback);
}
self.jobBackend.setPending(job, callback);
self.jobBackend.setPending(job, queryIndex, callback);
});
};

1
batch/job_runner.js
View File

@ -102,7 +102,6 @@ JobRunner.prototype._run = function (job, query, callback) {
return self.jobBackend.setDone(job, query.index, callback);
}
self.jobBackend.setJobPendingAndQueryDone(job, query.index, function (err, job) {
if (err) {
return callback(err);