From 594aba6179d4d5c52ddd5dd504377ef0bbd48efb Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 21 Oct 2016 16:07:27 +0200
Subject: [PATCH] Stop migrating old queues by default

---
 NEWS.md             | 5 ++++-
 batch/batch.js      | 8 --------
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 59573cf5..9037c6eb 100644
--- a/NEWS.md
+++ b/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:
  * Fix some scenarios where batch queries got stuck waiting for available slots.
 
diff --git a/batch/batch.js b/batch/batch.js
index 7bc985eb..0a898d2e 100644
--- a/batch/batch.js
+++ b/batch/batch.js
@@ -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(
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c82e65c4..f8f3ade0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb_sql_api",
-  "version": "1.40.1",
+  "version": "1.41.0",
   "dependencies": {
     "bintrees": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 7f59a9c2..2c1757f0 100644
--- a/package.json
+++ b/package.json
@@ -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"