Merge pull request #657 from basho/integration/riak-admin-handoff-team

Integration/riak admin handoff team

Author: andrewjstone

rel/files/riak-admin

@@ -29,7 +29,8 @@ usage() {
     echo "                    aae-status | diag | stat | status | transfer-limit | reformat-indexes |"
     echo "                    top [-interval N] [-sort reductions|memory|msg_q] [-lines N] |"
     echo "                    downgrade-objects | security | bucket-type | repair-2i |"
-    echo "                    search | services | ensemble-status }"
+    echo "                    search | services | ensemble-status | handoff | set |"
+    echo "                    show | describe }"
 }
 
 stat_admin()
@@ -304,6 +305,19 @@ cluster_admin()
             node_up_check
             $NODETOOL rpc riak_core_console clear_staged
             ;;
+        status)
+            node_up_check
+            $NODETOOL rpc riak_core_console command $SCRIPT cluster status
+            ;;
+        partitions|partition)
+            node_up_check
+            $NODETOOL rpc riak_core_console command $SCRIPT cluster $@
+            ;;
+        partition[_-]count)
+            node_up_check
+            shift
+            $NODETOOL rpc riak_core_console command $SCRIPT cluster partition-count $@
+            ;;
         *)
             echo "\
 Usage: $SCRIPT cluster <command>
@@ -312,25 +326,44 @@ The following commands stage changes to cluster membership. These commands
 do not take effect immediately. After staging a set of changes, the staged
 plan must be committed to take effect:
 
-   join <node>                    Join node to the cluster containing <node>
-   leave                          Have this node leave the cluster and shutdown
-   leave <node>                   Have <node> leave the cluster and shutdown
+   join <node>                     Join node to the cluster containing <node>
+   leave                           Have this node leave the cluster and shutdown
+   leave <node>                    Have <node> leave the cluster and shutdown
 
-   force-remove <node>            Remove <node> from the cluster without
-                                  first handing off data. Designed for
-                                  crashed, unrecoverable nodes
+   force-remove <node>             Remove <node> from the cluster without
+                                   first handing off data. Designed for
+                                   crashed, unrecoverable nodes
 
-   replace <node1> <node2>        Have <node1> transfer all data to <node2>,
-                                  and then leave the cluster and shutdown
+   replace <node1> <node2>         Have <node1> transfer all data to <node2>,
+                                   and then leave the cluster and shutdown
 
-   force-replace <node1> <node2>  Reassign all partitions owned by <node1> to
-                                  <node2> without first handing off data, and
-                                  remove <node1> from the cluster.
+   force-replace <node1> <node2>   Reassign all partitions owned by <node1> to
+                                   <node2> without first handing off data, and
+                                   remove <node1> from the cluster.
 
 Staging commands:
-   plan                           Display the staged changes to the cluster
-   commit                         Commit the staged changes
-   clear                          Clear the staged changes
+   plan                            Display the staged changes to the cluster
+   commit                          Commit the staged changes
+   clear                           Clear the staged changes
+
+Status and information commands:
+   status                          Display a concise summary of node membership
+                                   availability and ring ownership.
+
+   partitions [--node=<node>]      Print primary, secondary and stopped
+                                   partition indices and ids for the current
+                                   node, or for the specified node.
+
+   partition-count [--node=<node>] Print the cluster-wide number of
+                                   partitions or the number of partitions
+                                   on the specified node.
+
+   partition id=<id>               Convert the given partition id to the
+                                   matching index.
+
+   partition index=<index>         Convert the given partition index to
+                                   the matching id.
+
 "
     esac
 }
@@ -1036,6 +1069,26 @@ case "$1" in
         shift
         btype_admin "$@"
         ;;
+    handoff)
+        # New pattern for command line. Use nodetool for RPC
+        node_up_check
+        exec $NODETOOL rpc riak_core_console command $SCRIPT $@
+        ;;
+    set)
+        # New pattern for command line. Use nodetool for RPC
+        node_up_check
+        exec $NODETOOL rpc riak_core_console command $SCRIPT $@
+        ;;
+    show)
+        # New pattern for command line. Use nodetool for RPC
+        node_up_check
+        exec $NODETOOL rpc riak_core_console command $SCRIPT $@
+        ;;
+    describe)
+        # New pattern for command line. Use nodetool for RPC
+        node_up_check
+        exec $NODETOOL rpc riak_core_console command $SCRIPT $@
+        ;;
     transfer[_-]limit)
         if [ $# -gt 3 ]; then
             echo "Usage: $SCRIPT $1"

rel/reltool.config

@@ -19,6 +19,7 @@
          webmachine,
          basho_stats,
          bitcask,
+         clique,
          riak_core,
          riak_pipe,
          riak_kv,
@@ -51,6 +52,7 @@
        {app, erlang_js, [{incl_cond, include}]},
        {app, riaknostic, [{incl_cond, include}]},
        {app, bitcask, [{incl_cond, include}]},
+       {app, clique, [{incl_cond, include}]},
        {app, riak_core, [{incl_cond, include}]},
        {app, riak_pipe, [{incl_cond, include}]},
        {app, riak_kv, [{incl_cond, include}]},