Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use LIFO for returning/retrieving connections from the pool #2085

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Readme.md
Expand Up @@ -367,8 +367,7 @@ time one is needed.

Connections are lazily created by the pool. If you configure the pool to allow
up to 100 connections, but only ever use 5 simultaneously, only 5 connections
will be made. Connections are also cycled round-robin style, with connections
being taken from the top of the pool and returning to the bottom.
will be made.

When a previous connection is retrieved from the pool, a ping packet is sent
to the server to check if the connection is still good.
Expand All @@ -391,6 +390,9 @@ constructor. In addition to those options pools accept a few extras:
* `queueLimit`: The maximum number of connection requests the pool will queue
before returning an error from `getConnection`. If set to `0`, there is no
limit to the number of queued connection requests. (Default: `0`)
* `roundRobinConnectionCycling`: Whether the pool should cycle through connections
or not. If set to false, connections will be retrieved and returned to the pool
on a last in first out basis. (Default: `true`)

## Pool events

Expand Down
8 changes: 6 additions & 2 deletions lib/Pool.js
Expand Up @@ -136,10 +136,14 @@ Pool.prototype.releaseConnection = function releaseConnection(connection) {
// connection already in free connection pool
// this won't catch all double-release cases
throw new Error('Connection already released');
} else {
// add connection to end of free queue
} else if (this.config.roundRobinConnectionCycling) {
// add connection to the bottom of the free queue
this._freeConnections.push(connection);
this.emit('release', connection);
} else {
// add connection to the top of the free queue
this._freeConnections.unshift(connection);
this.emit('release', connection);
}
}

Expand Down
4 changes: 4 additions & 0 deletions lib/PoolConfig.js
Expand Up @@ -20,6 +20,10 @@ function PoolConfig(options) {
this.queueLimit = (options.queueLimit === undefined)
? 0
: Number(options.queueLimit);
this.roundRobinConnectionCycling = (options.roundRobinConnectionCycling === undefined)
? true
: Boolean(options.roundRobinConnectionCycling);

}

PoolConfig.prototype.newConnectionConfig = function newConnectionConfig() {
Expand Down
48 changes: 48 additions & 0 deletions test/unit/pool/test-connection-cycling-lifo.js
@@ -0,0 +1,48 @@
var after = require('after');
var assert = require('assert');
var common = require('../../common');
var pool = common.createPool({
port : common.fakeServerPort,
roundRobinConnectionCycling : false
});

var server = common.createFakeServer();
var lastConnectionId = null;
var numberOfConnections = 4;

server.listen(common.fakeServerPort, function (err) {
assert.ifError(err);

var getConnectionAndEnsureItsTheLastConnection = function(cb) {
pool.getConnection(function (err, connection) {
assert.ifError(err);
assert.ok(connection.id === lastConnectionId);
connection.release();
if (cb) cb();
});
};

var done = after(numberOfConnections, function () {
getConnectionAndEnsureItsTheLastConnection(function() {
getConnectionAndEnsureItsTheLastConnection(function() {
pool.end(function (err) {
assert.ifError(err);
server.destroy();
});
});
});
});

var counter = 1;

var createIndexedConnection = function () {
pool.getConnection(function (err, connection) {
assert.ifError(err);
connection.id = counter++;
lastConnectionId = connection.id;
connection.release();
done();
});
};
Array.apply(null, Array(numberOfConnections)).map(createIndexedConnection);
});
47 changes: 47 additions & 0 deletions test/unit/pool/test-connection-cycling-round-robin.js
@@ -0,0 +1,47 @@
var after = require('after');
var assert = require('assert');
var common = require('../../common');
var pool = common.createPool({port: common.fakeServerPort});

var server = common.createFakeServer();
var numberOfConnections = 4;
var connectionIds = [];
var connectionNumber = 0;

server.listen(common.fakeServerPort, function (err) {
assert.ifError(err);

var getConnectionAndEnsureItsTheCorrectOne = function(cb) {
pool.getConnection(function (err, connection) {
assert.ifError(err);
assert.ok(connection.id === connectionIds[connectionNumber]);
connectionNumber++;
connection.release();
if (cb) cb();
});
};

var done = after(numberOfConnections, function () {
getConnectionAndEnsureItsTheCorrectOne(function() {
getConnectionAndEnsureItsTheCorrectOne(function() {
pool.end(function (err) {
assert.ifError(err);
server.destroy();
});
});
});
});

var counter = 1;

var createIndexedConnection = function () {
pool.getConnection(function (err, connection) {
assert.ifError(err);
connection.id = counter++;
connectionIds.push(connection.id);
connection.release();
done();
});
};
Array.apply(null, Array(numberOfConnections)).map(createIndexedConnection);
});