Consolidate member related admin endpoints

esatterwhite · Oct 1, 2015 · 0df9a27 · 0df9a27
1 parent 83f48ab
commit 0df9a27
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 67 deletions.
diff --git a/server/admin/index.js b/server/admin/index.js
@@ -35,13 +35,15 @@ var baseEndpointHandlers = {
         endpoint: '/admin/gossip',
         handler: require('./gossip.js').gossipStart.handler
     },
+    // Deprecated! Use /admin/member/join
     join: {
         endpoint: '/admin/join',
-        handler: require('./join.js')
+        handler: require('./member.js').memberJoin.handler
     },
+    // Deprecated! Use /admin/member/leave
     leave: {
         endpoint: '/admin/leave',
-        handler: require('./leave.js')
+        handler: require('./member.js').memberLeave.handler
     },
     lookup: {
         endpoint: '/admin/lookup',
@@ -63,4 +65,4 @@ var baseEndpointHandlers = {
 };
 
 module.exports = _.extend({}, baseEndpointHandlers, require('./config.js'),
-    require('./gossip.js'));
+    require('./gossip.js'), require('./member.js'));
diff --git a/server/admin/leave.js b/server/admin/leave.js
diff --git a/server/admin/join.js → server/admin/member.js b/server/admin/join.js → server/admin/member.js
@@ -21,8 +21,14 @@
 
 var errors = require('../../lib/errors.js');
 var sendJoin = require('../../lib/swim/join-sender.js').joinCluster;
+var TypedError = require('error/typed');
 
-module.exports = function createJoinHandler(ringpop) {
+var RedundantLeaveError = TypedError({
+    type: 'ringpop.invalid-leave.redundant',
+    message: 'A node cannot leave its cluster when it has already left.'
+});
+
+function createJoinHandler(ringpop) {
     return function handleJoin(arg1, arg2, hostInfo, callback) {
         if (!ringpop.membership.localMember) {
             process.nextTick(function() {
@@ -58,4 +64,48 @@ module.exports = function createJoinHandler(ringpop) {
             }));
         });
     };
+}
+
+function createLeaveHandler(ringpop) {
+    return function handleLeave(arg1, arg2, hostInfo, callback) {
+        if (typeof callback !== 'function') {
+            callback = function noop() {};
+        }
+
+        if (!ringpop.membership.localMember) {
+            process.nextTick(function() {
+                callback(errors.InvalidLocalMemberError());
+            });
+            return;
+        }
+
+        if (ringpop.membership.localMember.status === 'leave') {
+            process.nextTick(function() {
+                callback(RedundantLeaveError());
+            });
+            return;
+        }
+
+        // TODO Explicitly infect other members (like admin join)?
+        ringpop.membership.makeLeave(ringpop.whoami(),
+            ringpop.membership.localMember.incarnationNumber);
+
+        ringpop.gossip.stop();
+        ringpop.suspicion.stopAll();
+
+        process.nextTick(function() {
+            callback(null, null, 'ok');
+        });
+    };
+}
+
+module.exports = {
+    memberJoin: {
+        endpoint: '/admin/member/join',
+        handler: createJoinHandler
+    },
+    memberLeave: {
+        endpoint: '/admin/member/leave',
+        handler: createLeaveHandler
+    }
 };
diff --git a/test/index-test.js b/test/index-test.js
@@ -18,14 +18,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 var _ = require('underscore');
-var createAdminJoinHandler = require('../server/admin/join.js');
-var createAdminLeaveHandler = require('../server/admin/leave.js');
+var AdminMember = require('../server/admin/member.js');
 var createJoinHandler = require('../server/protocol/join.js');
 var mock = require('./mock');
 var Ringpop = require('../index.js');
 var test = require('tape');
 var testRingpop = require('./lib/test-ringpop.js');
 
+var createAdminJoinHandler = AdminMember.memberJoin.handler;
+var createAdminLeaveHandler = AdminMember.memberLeave.handler;
+
 function createRingpop(opts) {
     var ringpop = new Ringpop(_.extend({
         app: 'test',