Skip to content

Commit 594aba6

Browse files
committed
Stop migrating old queues by default
1 parent 506581a commit 594aba6

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
1.40.1 - 2016-mm-dd
1+
1.41.0 - 2016-mm-dd
22
-------------------
33

4+
Announcements:
5+
* Stop migrating old queues by default.
6+
47
Bug fixes:
58
* Fix some scenarios where batch queries got stuck waiting for available slots.
69

batch/batch.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var util = require('util');
44
var EventEmitter = require('events').EventEmitter;
55
var debug = require('./util/debug')('batch');
66
var queue = require('queue-async');
7-
var HostUserQueueMover = require('./maintenance/host-user-queue-mover');
87
var HostScheduler = require('./scheduler/host-scheduler');
98

109
var EMPTY_QUEUE = true;
@@ -19,7 +18,6 @@ function Batch(name, jobSubscriber, jobQueue, jobRunner, jobService, jobPublishe
1918
this.jobPublisher = jobPublisher;
2019
this.logger = logger;
2120
this.hostScheduler = new HostScheduler(name, { run: this.processJob.bind(this) }, redisPool);
22-
this.hostUserQueueMover = new HostUserQueueMover(jobQueue, jobService, this.locker, redisPool);
2321

2422
// map: user => jobId. Will be used for draining jobs.
2523
this.workInProgressJobs = {};
@@ -29,12 +27,6 @@ util.inherits(Batch, EventEmitter);
2927
module.exports = Batch;
3028

3129
Batch.prototype.start = function () {
32-
this.hostUserQueueMover.moveOldJobs(function() {
33-
this.subscribe();
34-
}.bind(this));
35-
};
36-
37-
Batch.prototype.subscribe = function () {
3830
var self = this;
3931

4032
this.jobSubscriber.subscribe(

npm-shrinkwrap.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"keywords": [
66
"cartodb"
77
],
8-
"version": "1.40.1",
8+
"version": "1.41.0",
99
"repository": {
1010
"type": "git",
1111
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git"

0 commit comments

Comments
 (0)