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

Reused matadata backend instance for batch service

Browse Source
This commit is contained in:
Daniel García Aubert 2015-12-14 10:36:16 +01:00
parent fe9280b0f7
commit d0787d03f7
6 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.js
View File

@ -181,7 +181,7 @@ function App() {
versionController.route(app);
if (global.settings.environment !== 'test') {
batchService(5000, 100);
batchService(metadataBackend, 5000, 100);
}
return app;

11
batch/batch_manager_factory.js
View File

@ -1,21 +1,12 @@
'use strict';
var cartoDBRedis = require('cartodb-redis');
var UserDatabaseMetadataService = require('./user_database_metadata_service');
var UsernameQueue = require('./username_queue');
var JobService = require('./job_service');
var JobCounterService = require('./job_counter_service');
var BatchManager = require('./batch_manager');
module.exports = function (maxJobsPerHost) {
var metadataBackend = cartoDBRedis({
host: global.settings.redis_host,
port: global.settings.redis_port,
max: global.settings.redisPool,
idleTimeoutMillis: global.settings.redisIdleTimeoutMillis,
reapIntervalMillis: global.settings.redisReapIntervalMillis
});
module.exports = function (metadataBackend ,maxJobsPerHost) {
var usernameQueue = new UsernameQueue(metadataBackend);
var userDatabaseMetadataService = new UserDatabaseMetadataService(metadataBackend);
var jobService = new JobService(metadataBackend);

4
batch/index.js
View File

@ -3,8 +3,8 @@
var BatchLauncher = require('./batch_launcher');
var batchManagerFactory = require('./batch_manager_factory');
module.exports = function (interval, maxJobsPerHost) {
var batchManager = batchManagerFactory(maxJobsPerHost);
module.exports = function (metadataBackend, interval, maxJobsPerHost) {
var batchManager = batchManagerFactory(metadataBackend, maxJobsPerHost);
var batchLauncher = new BatchLauncher(batchManager);
// here we go!

16
batch/username_queue.js
View File

@ -11,26 +11,14 @@ UsernameQueue.prototype.enqueue = function (cdbUsername, callback) {
var db = this.db;
var queue = this.queueName;
this.metadataBackend.redisCmd(db, 'LPUSH', [queue, cdbUsername], function (err, cdbUsername) {
if (err) {
return callback(err);
}
callback(null, cdbUsername);
});
this.metadataBackend.redisCmd(db, 'LPUSH', [queue, cdbUsername], callback);
};
UsernameQueue.prototype.dequeue = function (callback) {
var db = this.db;
var queue = this.queueName;
this.metadataBackend.redisCmd(db, 'RPOP', [queue], function (err, cdbUsername) {
if (err) {
return callback(err);
}
callback(null, cdbUsername);
});
this.metadataBackend.redisCmd(db, 'RPOP', [queue], callback);
};
module.exports = UsernameQueue;

11
test/acceptance/batch.test.js
View File

@ -3,7 +3,16 @@ var batchManagerFactory = require('../../batch/batch_manager_factory');
describe('batch manager', function() {
it('run', function (done) {
batchManagerFactory().run(function (err) {
var metadataBackend = require('cartodb-redis')({
host: global.settings.redis_host,
port: global.settings.redis_port,
max: global.settings.redisPool,
idleTimeoutMillis: global.settings.redisIdleTimeoutMillis,
reapIntervalMillis: global.settings.redisReapIntervalMillis
});
var maxJobsPerHost = 100;
batchManagerFactory(metadataBackend, maxJobsPerHost).run(function (err) {
done(err);
});
});

33
test/unit/batch/username_queue.js Normal file
View File

@ -0,0 +1,33 @@
var UsernameQueue = require('../../../batch/username_queue');
var assert = require('assert');
describe('batch API username queue', function () {
beforeEach(function () {
this.metadataBackend = {
redisCmd: function () {
var callback = arguments[arguments.length -1];
process.nextTick(function () {
callback(null, 'irrelevantUsername');
});
}
};
this.usernameQueue = new UsernameQueue(this.metadataBackend);
});
it('.enqueue(username) should enqueue the provided username', function (done) {
this.usernameQueue.enqueue('irrelevantUsername', function (err, username) {
assert.ok(!err);
assert.equal(username, 'irrelevantUsername');
done();
});
});
it('.dequeue(username) should dequeue the next username', function (done) {
this.usernameQueue.dequeue(function (err, username) {
assert.ok(!err);
assert.equal(username, 'irrelevantUsername');
done();
});
});
});