Merge pull request #23 from uber/ws-show-more-state-of-partition

add # of alive, suspect and faulty to partitions.js

Author: CorgiMan

lib/cluster.js

@@ -21,6 +21,7 @@
 
 var fs = require('fs');
 
+var _ = require('underscore');
 var async = require('async');
 var AdminClient = require('./admin-client.js');
 var Partition = require('./partition.js');
@@ -231,6 +232,11 @@ Cluster.prototype.parseStats = function parseStats(stats) {
         cluster.membershipChecksum = stats.membershipChecksum;
         cluster.membership = stats.members;
 
+        var membersByStatus = _.groupBy(stats.members, 'status');
+        cluster.aliveCount = _.size(membersByStatus.alive);
+        cluster.suspectCount = _.size(membersByStatus.suspect);
+        cluster.faultyCount = _.size(membersByStatus.faulty);
+
         this.partitions[cluster.membershipChecksum] = cluster;
     }
 

lib/partition.js

@@ -24,6 +24,9 @@ function Partition() {
     this.membership = null;
     this.nodes = [];
     this.nodeCount = 0;
+    this.aliveCount = 0;
+    this.suspectCount = 0;
+    this.faultyCount = 0;
 }
 
 Partition.prototype.addNode = function addNode(node) {

package.json

@@ -31,7 +31,8 @@
     "cli-table": "^0.3.1",
     "commander": "^2.6.0",
     "ringpop": "^10.0.0",
-    "tchannel": "2.7.4"
+    "tchannel": "2.7.4",
+    "underscore": "^1.8.3"
   },
   "devDependencies": {
     "cli-color": "^0.3.3",

partitions.js

@@ -45,13 +45,23 @@ function main() {
             headers = [
                 'Checksum',
                 '# Nodes',
+                '# Alive',
+                '# Suspect',
+                '# Faulty',
                 'Sample Host'
             ];
         }
 
         var table = createTable(headers);
         partitions.forEach(function each(partition) {
-            table.push([partition.membershipChecksum, partition.nodeCount, String(partition.nodes[0])]);
+            table.push([
+                partition.membershipChecksum,
+                partition.nodeCount, 
+                partition.aliveCount,
+                partition.suspectCount,
+                partition.faultyCount,
+                String(partition.nodes[0])
+            ]);
         });
         console.log(table.toString());
         process.exit();

tests/checksum.t

@@ -20,7 +20,7 @@ Invalid bootstrap file
 
   $  ringpop-admin checksums QWERTY
 
-  assert.js:93
+  assert.js:* (glob)
     throw new assert.AssertionError({
           ^
   AssertionError: invalid destination

tests/partitions.t

@@ -1,15 +1,15 @@
 Partitions command success:
 
   $  ringpop-admin partitions 127.0.0.1:3000
-   Checksum     # Nodes   Sample Host* (glob)
-   *   5         127.0.0.1:3000* (glob)
+   Checksum*# Nodes*# Alive*# Suspect*# Faulty*Sample Host* (glob)
+   *5*5*0*0*127.0.0.1:3000* (glob)
 
 
 With bootstrap file:
 
   $  ringpop-admin partitions $TESTDIR/hosts.json
-   Checksum     # Nodes   Sample Host* (glob)
-   *   5         127.0.0.1:* (glob)
+   Checksum*# Nodes*# Alive*# Suspect*# Faulty*Sample Host* (glob)
+   *5*5*0*0*127.0.0.1:* (glob)
 
 
 Unable to connect to host: