Stop migrating old queues by default

This commit is contained in:
Raul Ochoa 2016-10-21 16:07:27 +02:00
parent 506581a4a9
commit 594aba6179
4 changed files with 6 additions and 11 deletions

View File

@ -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:
* Fix some scenarios where batch queries got stuck waiting for available slots.

View File

@ -4,7 +4,6 @@ var util = require('util');
var EventEmitter = require('events').EventEmitter;
var debug = require('./util/debug')('batch');
var queue = require('queue-async');
var HostUserQueueMover = require('./maintenance/host-user-queue-mover');
var HostScheduler = require('./scheduler/host-scheduler');
var EMPTY_QUEUE = true;
@ -19,7 +18,6 @@ function Batch(name, jobSubscriber, jobQueue, jobRunner, jobService, jobPublishe
this.jobPublisher = jobPublisher;
this.logger = logger;
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.
this.workInProgressJobs = {};
@ -29,12 +27,6 @@ util.inherits(Batch, EventEmitter);
module.exports = Batch;
Batch.prototype.start = function () {
this.hostUserQueueMover.moveOldJobs(function() {
this.subscribe();
}.bind(this));
};
Batch.prototype.subscribe = function () {
var self = this;
this.jobSubscriber.subscribe(

2
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "cartodb_sql_api",
"version": "1.40.1",
"version": "1.41.0",
"dependencies": {
"bintrees": {
"version": "1.0.1",

View File

@ -5,7 +5,7 @@
"keywords": [
"cartodb"
],
"version": "1.40.1",
"version": "1.41.0",
"repository": {
"type": "git",
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git"