Add damp scores to status command

Author: jwolski

checksums.js

@@ -21,7 +21,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var createTable = require('./lib/table.js');
+var createTable = require('./lib/table.js').create;
 var ClusterManager = require('./lib/cluster.js');
 var program = require('commander');
 

commands.js

@@ -26,9 +26,10 @@ function ReuseCommand(tchannelV1, coordinator, member, limit) {
     this.limit = limit;
 }
 
-function StatusCommand(tchannelV1, coordinator) {
+function StatusCommand(tchannelV1, coordinator, quiet) {
     this.useTChannelV1 = tchannelV1;
     this.coordinator = coordinator;
+    this.quiet = quiet;
 }
 
 function PartitionCommand(tchannelV1, coordinatorOrFile, quiet) {

dist.js

@@ -23,7 +23,7 @@
 
 var CliColor = require('cli-color');
 var AdminClient = require('./lib/admin-client.js');
-var createTable = require('./lib/table.js');
+var createTable = require('./lib/table.js').create;
 var HashRing = require('ringpop/lib/ring/index.js');
 var program = require('commander');
 

lib/table.js

@@ -23,7 +23,7 @@
 
 var CliTable = require('cli-table');
 
-module.exports = function createTable(head) {
+function create(head) {
     return new CliTable({
         chars: {
             'bottom': '' ,
@@ -44,4 +44,21 @@ module.exports = function createTable(head) {
         },
         head: head
     });
+}
+
+function print(command, headers, addRowsFn) {
+    headers = command.quiet === true ? [] : headers;
+
+    var table = create(headers);
+
+    if (typeof addRowsFn === 'function') {
+        addRowsFn(table);
+    }
+
+    console.log(table.toString());
+}
+
+module.exports ={
+    create: create,
+    print: print
 };

lib/util.js

@@ -19,6 +19,12 @@
 // THE SOFTWARE.
 'use strict';
 
+function assertTruthy(truthy, message) {
+    if (!!truthy) return;
+    console.error(message);
+    process.exit(1);
+}
+
 function assertNoError(err) {
     if (err) {
         console.error('Error: ' + err.message);
@@ -37,5 +43,6 @@ function safeParse(data) {
 module.exports = {
     assertNoErr: assertNoError,
     assertNoError: assertNoError,
+    assertTruthy: assertTruthy,
     safeParse: safeParse
 };

parser.js

@@ -49,12 +49,16 @@ function parseReuseCommand() {
 function parseStatusCommand() {
     program
         .description('Status of members in ring')
+        .option('-q, --quiet', 'Do not print headers')
         .option('--tchannel-v1')
         .usage('[options] <hostport or bootstrapfile>');
     program.parse(process.argv);
     assertPositionArg(program, 0, 'hostport or bootstrapfile');
 
-    return new commands.StatusCommand(program.tchannelV1, program.args[0]);
+    return new commands.StatusCommand(
+        program.tchannelV1,
+        program.args[0],
+        program.quiet);
 }
 
 function parsePartitionCommand() {

partitions.js

@@ -21,7 +21,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var createTable = require('./lib/table.js');
+var createTable = require('./lib/table.js').create;
 var ClusterManager = require('./lib/cluster.js');
 var parsePartitionCommand = require('./parser.js').parsePartitionCommand;
 

reuse.js

@@ -22,7 +22,7 @@
 'use strict';
 
 var Cluster = require('./lib/cluster.js');
-var createTable = require('./lib/table.js');
+var createTable = require('./lib/table.js').create;
 var parseReuseCommand = require('./parser.js').parseReuseCommand;
 
 function main() {

status.js

@@ -21,37 +21,63 @@
 // THE SOFTWARE.
 'use strict';
 
-var createTable = require('./lib/table.js');
-var ClusterManager = require('./lib/cluster.js');
+var assertTruthy = require('./lib/util.js').assertTruthy;
+var Cluster = require('./lib/cluster.js');
 var parseStatusCommand = require('./parser.js').parseStatusCommand;
+var printTable = require('./lib/table.js').print;
+
+function getDampScoreRange(allStats, statusMember) {
+    var lowest = Number.MAX_VALUE;
+    var highest = 0;
+
+    allStats.forEach(function each(stat) {
+        stat.members.forEach(function each(member) {
+            if (member.address !== statusMember.address) return;
+
+            var dampScore = member.dampScore;
+            if (typeof dampScore === 'undefined') {
+                return;
+            }
+
+            if (dampScore < lowest) {
+                lowest = dampScore;
+            }
+
+            if (dampScore > highest) {
+                highest = dampScore;
+            }
+        });
+    });
+
+    return lowest + '..' + highest;
+}
 
 function main() {
     var command = parseStatusCommand();
-    var clusterManager = new ClusterManager({
+    var cluster = new Cluster({
         useTChannelV1: command.useTChannelV1,
         coordAddr: command.coordinator
     });
-    clusterManager.fetchStats(function onStats(err) {
-        if (err) {
-            console.error('Error: ' + err.message);
-            process.exit(1);
-        }
-
-        if (clusterManager.getPartitionCount() > 1) {
-            console.error('Error: cluster is partitioned. An accurate status cannot be provided.');
-            process.exit(1);
-        }
-
-        var table = createTable([]);
-        var cluster = clusterManager.getClusterAt(0);
-        if (!cluster) {
-            console.error('Error: no members in the cluster could be reached');
-            process.exit(1);
-        }
-        cluster.membership.forEach(function each(member) {
-            table.push([member.address, member.status]);
+    cluster.fetchStats(function onStats(err) {
+        assertTruthy(!err, (err && err.message));
+        assertTruthy(cluster.getClusterAt(0),
+            'Error: no members in the cluster could be reached');
+        assertTruthy(cluster.getPartitionCount() === 1,
+            'Error: cluster is partitioned. ' +
+            'An accurate status cannot be provided');
+
+        var partition = cluster.getPartitionAt(0);
+        printTable(command, [
+            'ADDRESS',
+            'STATUS',
+            'DAMPSCORE'
+        ], function addRows(table) {
+            // Add status information to table
+            partition.membership.forEach(function each(member) {
+                table.push([member.address, member.status,
+                    getDampScoreRange(cluster.allStats, member)]);
+            });
         });
-        console.log(table.toString());
         process.exit();
     });
 }

top.js

@@ -24,7 +24,7 @@
 var CliColor = require('cli-color');
 var program = require('commander');
 
-var createTable = require('./lib/table.js');
+var createTable = require('./lib/table.js').create;
 var ClusterManager = require('./lib/cluster.js');
 
 var currentRows;