Stop migrating old queues by default
This commit is contained in:
parent
506581a4a9
commit
594aba6179
5
NEWS.md
5
NEWS.md
@ -1,6 +1,9 @@
|
|||||||
1.40.1 - 2016-mm-dd
|
1.41.0 - 2016-mm-dd
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
Announcements:
|
||||||
|
* Stop migrating old queues by default.
|
||||||
|
|
||||||
Bug fixes:
|
Bug fixes:
|
||||||
* Fix some scenarios where batch queries got stuck waiting for available slots.
|
* Fix some scenarios where batch queries got stuck waiting for available slots.
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ var util = require('util');
|
|||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var debug = require('./util/debug')('batch');
|
var debug = require('./util/debug')('batch');
|
||||||
var queue = require('queue-async');
|
var queue = require('queue-async');
|
||||||
var HostUserQueueMover = require('./maintenance/host-user-queue-mover');
|
|
||||||
var HostScheduler = require('./scheduler/host-scheduler');
|
var HostScheduler = require('./scheduler/host-scheduler');
|
||||||
|
|
||||||
var EMPTY_QUEUE = true;
|
var EMPTY_QUEUE = true;
|
||||||
@ -19,7 +18,6 @@ function Batch(name, jobSubscriber, jobQueue, jobRunner, jobService, jobPublishe
|
|||||||
this.jobPublisher = jobPublisher;
|
this.jobPublisher = jobPublisher;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.hostScheduler = new HostScheduler(name, { run: this.processJob.bind(this) }, redisPool);
|
this.hostScheduler = new HostScheduler(name, { run: this.processJob.bind(this) }, redisPool);
|
||||||
this.hostUserQueueMover = new HostUserQueueMover(jobQueue, jobService, this.locker, redisPool);
|
|
||||||
|
|
||||||
// map: user => jobId. Will be used for draining jobs.
|
// map: user => jobId. Will be used for draining jobs.
|
||||||
this.workInProgressJobs = {};
|
this.workInProgressJobs = {};
|
||||||
@ -29,12 +27,6 @@ util.inherits(Batch, EventEmitter);
|
|||||||
module.exports = Batch;
|
module.exports = Batch;
|
||||||
|
|
||||||
Batch.prototype.start = function () {
|
Batch.prototype.start = function () {
|
||||||
this.hostUserQueueMover.moveOldJobs(function() {
|
|
||||||
this.subscribe();
|
|
||||||
}.bind(this));
|
|
||||||
};
|
|
||||||
|
|
||||||
Batch.prototype.subscribe = function () {
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
this.jobSubscriber.subscribe(
|
this.jobSubscriber.subscribe(
|
||||||
|
2
npm-shrinkwrap.json
generated
2
npm-shrinkwrap.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cartodb_sql_api",
|
"name": "cartodb_sql_api",
|
||||||
"version": "1.40.1",
|
"version": "1.41.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bintrees": {
|
"bintrees": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"cartodb"
|
"cartodb"
|
||||||
],
|
],
|
||||||
"version": "1.40.1",
|
"version": "1.41.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git"
|
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git"
|
||||||
|
Loading…
Reference in New Issue
Block a user