Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules
*.swp
coverage
.env
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM node:0.10-onbuild
EXPOSE 8000
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,20 @@ to be loaded by dotenv:

```
npm install
node server
docker-compose up
```

This spins up the following:

* A kdihalas/beanstalkd container
* A worker container that executes `npm run worker`
* A web container with ```node server.js```

## Job Processing

compute-service contains a worker that can read jobs from a beanstalkd queue and
spin up instances. To configure, set the variable BEANSTALK_SERVER. The default
value is ```127.0.0.1:11300```. To run:

```shell
$ ./node_modules/beanstalk_worker/bin/
18 changes: 18 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
web:
build: .
command: node server.js
volumes:
- .:/usr/src/app
links:
- worker
ports:
- "8000:8000"
worker:
build: .
command: npm run worker
volumes:
- .:/usr/src/app
links:
- beanstalkd
beanstalkd:
image: kdihalas/beanstalkd
15 changes: 15 additions & 0 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,25 @@ dotenv.load();
nconf.use('memory');
nconf.env();

nconf.defaults({
BEANSTALK_SERVER: '127.0.0.1:11300'
});

if (nconf.get('BEANSTALKD_PORT')) {
nconf.set('BEANSTALK_SERVER', nconf.get('BEANSTALKD_PORT_11300_TCP_ADDR')+':'+nconf.get('BEANSTALKD_PORT_11300_TCP_PORT'));
};

nconf.defaults({
aws: {
accessKeyId: nconf.get('AWS_ACCESS_KEY_ID'),
secretAccessKey: nconf.get('AWS_SECRET_ACCESS_KEY')
},
beanstalk: {
server: nconf.get('BEANSTALK_SERVER'),
workers: 1
},
codius: {
endpoint: nconf.get('CODIUS_URI')
}
});

Expand Down
72 changes: 72 additions & 0 deletions lib/job-queue.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
var bluebird = require('bluebird');
var Promise = bluebird.Promise;
var config = require('./config');
var beanstalk = require('nodestalker');

module.exports = function(tubeName) {
var self = this;
self.client = beanstalk.Client(config.get('beanstalk:server'));
self.workers = {};
self.tubeName = tubeName;
bluebird.promisifyAll(self.client, {promisifier: promisify});
self.tubeDelay = self.client.useAsync(self.tubeName).then(function() {
return self.client.watchAsync(self.tubeName);
});
}

module.exports.prototype = {
useTube: function() {
return this.tubeDelay;
},

addWorker: function(name, worker) {
var self = this;
if (typeof(worker.run) !== 'function') {
throw new Error("Object with a run() method must be passed in");
}
self.workers[name] = worker;
},

enqueueJob: function(type, data) {
var self = this;
var job = {
type: type,
data: data
}
return self.client.putAsync(JSON.stringify(job));
},

processNextJob: function() {
var self = this;
var p = [];
var job;
return self.client.reserveAsync().then(function(_job) {
job = _job;
var realJob = JSON.parse(job.data);
if (realJob.type in self.workers) {
var r = self.workers[realJob.type].run(realJob.data);
if (typeof(r) === 'undefined') {
r = bluebird.resolve();
}
return r.then(function() {
return self.client.deleteJobAsync(job.id);
});
} else {
//FIXME: Log unhandled job
return self.client.releaseAsync(job.id);
}
});
}
}

function promisify(method) {
return function() {
var self = this;
var args = arguments;
return new bluebird.Promise(function(resolve, reject) {
var r = method.apply(self, args);
r.onSuccess(function(v) {resolve(v)});
r.onError(function(err) {reject(new Error(err))});
});
}
}
14 changes: 13 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"scripts": {
"test": "istanbul cover _mocha",
"start": "node server.js",
"worker": "./node_modules/beanstalk_worker/bin/worker.js `pwd`/conf/workers.js"
},
"name": "compute-service",
"version": "0.1.0",
"description": "Codius host compute service",
Expand All @@ -10,8 +15,15 @@
"license": "ISC",
"dependencies": {
"aws-sdk": "^2.1.16",
"beanstalk_worker": "^0.2.1",
"bluebird": "^2.9.12",
"dotenv": "^0.5.1",
"nconf": "^0.7.1"
"nconf": "^0.7.1",
"nodestalker": "^0.1.17",
"request-promise": "^0.4.0"
},
"devDependencies": {
"chai": "^2.1.1",
"sinon": "^1.13.0"
}
}
34 changes: 34 additions & 0 deletions test/lib.job-queue.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
var bluebird = require('bluebird');

bluebird.longStackTraces();

var chai = require('chai');
var expect = chai.expect;
var JobQueue = require('../lib/job-queue');
var sinon = require('sinon');

var TestWorker = function() {
}

TestWorker.prototype = {
run: function(data) {}
}

describe('JobQueue', function() {
var queue, worker;

beforeEach(function() {
queue = new JobQueue('test_'+Math.round(Math.random()*100));
worker = new TestWorker();
queue.addWorker('test', worker);
});

it('should run a job after it is enqueued', function() {
sinon.spy(worker, 'run');
return queue.enqueueJob('test', {}).then(function() {
return queue.processNextJob();
}).then(function() {
expect(worker.run.called).to.equal(true);
});
});
});
26 changes: 26 additions & 0 deletions test/workers.launch.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
var Promise = require('bluebird').Promise;
var chai = require('chai');
var expect = chai.expect;
var JobQueue = require('../lib/job-queue');
var sinon = require('sinon');

var LaunchWorker = require('../workers/launch');

describe('launch handler', function() {
var queue, worker;

beforeEach(function() {
queue = new JobQueue('test_'+Math.random()*100);
worker = new LaunchWorker();
queue.addWorker('instance_launch', worker);
});

it('should handle an instance launch job', function() {
sinon.spy(worker, 'run');
return queue.enqueueJob('instance_launch', {}).then(function() {
return queue.processNextJob();
}).then(function() {
expect(worker.run.called).to.equal(true);
});
});
});
11 changes: 11 additions & 0 deletions workers/launch.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var request = require('request-promise');
var config = require('../lib/config');

module.exports = function() {
}

module.exports.prototype = {
run: function(data) {
return request(config.get('codius:endpoint'));
}
}