Add poolCluster.remove to remove pools from the cluster

closes mysqljs#1006
closes mysqljs#1007

Author: mlshvdv

Changes.md

@@ -4,6 +4,10 @@ This file is a manually maintained list of changes for each release. Feel free
 to add your changes here when sending pull requests. Also send corrections if
 you spot any mistakes.
 
+## HEAD
+
+* Add `poolCluster.remove` to remove pools from the cluster #1006 #1007
+
 ## v2.5.5 (2015-02-23)
 
 * Store SSL presets in JS instead of JSON #959

Readme.md

@@ -438,11 +438,16 @@ PoolCluster provides multiple hosts connection. (group & retry & selector)
 // create
 var poolCluster = mysql.createPoolCluster();
 
+// add configurations
 poolCluster.add(config); // anonymous group
 poolCluster.add('MASTER', masterConfig);
 poolCluster.add('SLAVE1', slave1Config);
 poolCluster.add('SLAVE2', slave2Config);
 
+// remove configurations
+poolCluster.remove('SLAVE2'); // By nodeId
+poolCluster.remove('SLAVE*'); // By target group : SLAVE1-2
+
 // Target Group : ALL(anonymous, MASTER, SLAVE1-2), Selector : round-robin(default)
 poolCluster.getConnection(function (err, connection) {});
 

lib/PoolCluster.js

@@ -63,6 +63,23 @@ PoolCluster.prototype.add = function(id, config) {
   }
 };
 
+PoolCluster.prototype.remove = function(pattern) {
+  var foundNodeIds = this._findNodeIds(pattern);
+
+  for (var i = 0; i < foundNodeIds.length; i++) {
+    var node = this._getNode(foundNodeIds[i]);
+    var index = this._serviceableNodeIds.indexOf(node.id);
+    if (index !== -1) {
+      this._serviceableNodeIds.splice(index, 1);
+      delete this._nodes[node.id];
+
+      this._clearFindCaches();
+
+      node.pool.end();
+    }
+  }
+};
+
 PoolCluster.prototype.getConnection = function(pattern, selector, cb) {
   var namespace;
   if (typeof pattern === 'function') {

test/unit/pool-cluster/test-remove-by-name.js

@@ -0,0 +1,40 @@
+var assert  = require('assert');
+var common  = require('../../common');
+var cluster = common.createPoolCluster();
+var server  = common.createFakeServer();
+
+var poolConfig = common.getTestConfig({port: common.fakeServerPort});
+cluster.add('SLAVE1', poolConfig);
+cluster.add('SLAVE2', poolConfig);
+
+server.listen(common.fakeServerPort, function (err) {
+  assert.ifError(err);
+
+  var pool = cluster.of('SLAVE*', 'ORDER');
+
+  pool.getConnection(function (err, connection) {
+    assert.ifError(err);
+    assert.strictEqual(connection._clusterId, 'SLAVE1');
+
+    connection.release();
+    cluster.remove('SLAVE1');
+
+    pool.getConnection(function (err, connection) {
+      assert.ifError(err);
+      assert.strictEqual(connection._clusterId, 'SLAVE2');
+
+      connection.release();
+      cluster.remove('SLAVE2');
+
+      pool.getConnection(function (err, connection) {
+        assert.ok(err);
+        assert.equal(err.code, 'POOL_NOEXIST');
+
+        cluster.remove('SLAVE1');
+        cluster.remove('SLAVE2');
+
+        server._server.close();
+      });
+    });
+  });
+});

test/unit/pool-cluster/test-remove-by-pattern.js

@@ -0,0 +1,31 @@
+var assert  = require('assert');
+var common  = require('../../common');
+var cluster = common.createPoolCluster();
+var server  = common.createFakeServer();
+
+var poolConfig = common.getTestConfig({port: common.fakeServerPort});
+cluster.add('SLAVE1', poolConfig);
+cluster.add('SLAVE2', poolConfig);
+
+server.listen(common.fakeServerPort, function (err) {
+  assert.ifError(err);
+
+  var pool = cluster.of('SLAVE*', 'ORDER');
+
+  pool.getConnection(function (err, connection) {
+    assert.ifError(err);
+    assert.strictEqual(connection._clusterId, 'SLAVE1');
+
+    connection.release();
+    cluster.remove('SLAVE*');
+
+    pool.getConnection(function (err, connection) {
+      assert.ok(err);
+      assert.equal(err.code, 'POOL_NOEXIST');
+
+      cluster.remove('SLAVE*');
+
+      server._server.close();
+    });
+  });
+});