Skip to content

Fix pool matching when a server has no assigned pool #354

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.

Sign up for GitHub

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

Open
aleclarson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix pool matching when a server has no assigned pool #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions lib/pool_master.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,30 +353,33 @@ PoolMaster.prototype.fetchServers = function(useSeeds) {
else {
var found = false;
for(var i=0; i<self._pools[UNKNOWN_POOLS].length; i++) {
if (((server.network.canonical_addresses[k].host === self._pools[UNKNOWN_POOLS][i].options.connection.host) ||
(helper.localhostAliases.hasOwnProperty(server.network.canonical_addresses[k].host) && (helper.localhostAliases.hasOwnProperty(self._pools[UNKNOWN_POOLS][i].options.connection.host)))) &&
(server.network.reql_port === self._pools[UNKNOWN_POOLS][i].options.connection.port)) {
found = true;

(function (pool) {
self._log('Removing pool connected to: '+pool.getAddress())
var pool = self._pools[UNKNOWN_POOLS].splice(i, 1)[0];
pool.drain().then(function() {
pool.removeAllListeners();
}).error(function(error) {
if (self._options.silent !== true) {
self._log('Pool connected to: '+pool.getAddress()+' could not be properly drained.')
self._log(error.message);
self._log(error.stack);
}
});
})(self._pools[UNKNOWN_POOLS][i]);
var pool = self._pools[UNKNOWN_POOLS][i];
for(var k=0; k<server.network.canonical_addresses.length; k++) {
if (((server.network.canonical_addresses[k].host === pool.options.connection.host) ||
(helper.localhostAliases.hasOwnProperty(server.network.canonical_addresses[k].host) && (helper.localhostAliases.hasOwnProperty(pool.options.connection.host)))) &&
(server.network.reql_port === pool.options.connection.port)) {
found = true;
break;
}
}
if (found) {
self._log('Removing pool connected to: '+pool.getAddress())
self._pools[UNKNOWN_POOLS].splice(i, 1);
pool.drain().then(function() {
pool.removeAllListeners();
}).fail(function(error) {
if (self._options.silent !== true) {
self._log('Pool connected to: '+pool.getAddress()+' could not be properly drained.')
self._log(error.message);
self._log(error.stack);
}
});
break;
}
}
}
if (found === false) {
self._log('A server was removed but no pool for this server exists...')
if (!found) {
self._log('A server was removed but no pool for this server exists...')
}
}
}
// We ignore this change since this it doesn't affect whether the server
Expand Down