New app, Riak Admin API, evolution of Riak Control

apps/riak/src/riak.app.src

@@ -15,6 +15,7 @@
        runtime_tools,
        cluster_info,
        riak_kv,
+       riak_admin_api,
        riak_auth_mods
        ]},
    {env, []}

rebar.config

@@ -9,7 +9,8 @@
 {deps, [
         {riak_logger, {git, "https://github.com/OpenRiak/riak_logger", {branch, "openriak-3.4"}}},
         {riak_kv, {git, "https://github.com/OpenRiak/riak_kv", {branch, "openriak-4.0"}}},
-        {riak_auth_mods, {git, "https://github.com/OpenRiak/riak_auth_mods", {branch, "openriak-3.4"}}}
+        {riak_auth_mods, {git, "https://github.com/OpenRiak/riak_auth_mods", {branch, "openriak-3.4"}}},
+        {riak_admin_api, {git, "https://github.com/TI-Tokyo/riak_admin_api", {branch, "openriak-4.0"}}}
       ]}.
 
 {project_plugins, [
@@ -33,7 +34,8 @@
         eleveldb_multi,
         leveled,
         leveled_multi,
-        multi_backend
+        multi_backend,
+        riak_admin_api
     ]}
 ]}.
 
@@ -49,14 +51,13 @@
      observer,
      runtime_tools,
      xmerl,
-     mochiweb,
-     webmachine,
      basho_stats,
      bitcask,
      clique,
      riak_core,
      riak_kv,
      riak_api,
+     riak_admin_api,
      cluster_info,
      riak_auth_mods,
      riak_logger]},
@@ -77,6 +78,7 @@
          {template, "rel/files/riak-chkconfig",  "bin/riak-chkconfig"},
          {template, "rel/files/riak-repl",       "bin/riak-repl"},
          {template, "rel/files/riak",            "usr/bin/riak"},
+         {template, "rel/files/riak-deadmanshand", "bin/riak-deadmanshand"},
 
          {copy,     "rel/files/hooks/check_ulimit",       "bin/hooks/check_ulimit"},
          {copy,     "rel/files/hooks/erl_codeloadingmode","bin/hooks/erl_codeloadingmode"},

rel/files/riak-admin

@@ -51,6 +51,7 @@ usage() {
     echo "                    reip | reip_manual | erl-reload | wait-for-service | "
     echo "                    ringready | transfers | force-remove | down |"
     echo "                    cluster-info | member-status | ring-status | vnode-status |"
+    echo "                    admin-api <subcommand> |"
     echo "                    tictacaae <subcommand> |"
     echo "                    aae-status | diag | stat | status | transfer-limit | reformat-indexes |"
     echo "                    top [-interval N] [-sort reductions|memory|msg_q] [-lines N] |"
@@ -623,6 +624,11 @@ tictacaae_admin()
     rpc riak_kv_console command $SCRIPT tictacaae "$@"
 }
 
+admin_api_admin()
+{
+    rpc riak_admin_api_console command $SCRIPT "admin-api" "$@"
+}
+
 
 
 # Check the first argument for instructions
@@ -1039,6 +1045,10 @@ case "$1" in
         shift
         tictacaae_admin "$@"
         ;;
+    admin-api)
+        shift
+        admin_api_admin "$@"
+        ;;
     *)
         usage
         exit 1

rel/files/riak-deadmanshand

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+p=$(pwd)
+
+if [ -z "{{pid_dir}}" ]; then
+    ## this is locally built rel or devrel
+    b=$(cd $(dirname "$0")/.. && pwd -P)
+    d=$b
+    cd $b
+else
+    ## packaged
+    d={{pid_dir}}
+    ## no cd: platform_bin_dir is absolute
+fi
+
+while true; do
+      sleep 3
+      if [ -r $d/RESTART_RIAK ]; then
+          {{platform_bin_dir}}/riak stop
+          {{platform_bin_dir}}/riak start
+          rm -f $d/RESTART_RIAK
+      fi
+      if [ -r $d/STOP_SELF ]; then
+          rm -f $d/STOP_SELF
+          break
+      fi
+done
+
+cd $p

rel/gen_dev

@@ -20,12 +20,14 @@ CM_PORT=$(($BASE + 6))
 PBPORT=$(($BASE + 7))
 WEBPORT=$(($BASE + 8))
 HANDOFFPORT=$(($BASE + 9))
+ADMINAPIPORT=$((BASE + 4))
 PLATFORM_BASE_DIR="$BUILD_ROOT/dev/$NAME/riak"
 
 echo "Generating $NAME - node='$NODE' pbc=$PBPORT http=$WEBPORT handoff=$HANDOFFPORT"
 sed -e "s|@PLATFORM_BASE_DIR@|$PLATFORM_BASE_DIR|" \
     -e "s/@NODE@/$NODE/" \
     -e "s/@PBPORT@/$PBPORT/" \
     -e "s/@WEBPORT@/$WEBPORT/" \
+    -e "s/@ADMINAPIPORT@/$ADMINAPIPORT/" \
     -e "s/@CM_PORT@/$CM_PORT/" \
     -e "s/@HANDOFFPORT@/$HANDOFFPORT/" < $TEMPLATE > $VARFILE

rel/pkg/alpine/vars.config

@@ -24,6 +24,8 @@
 {handoff_port,      8099}.
 {pb_ip,             "127.0.0.1"}.
 {pb_port,           8087}.
+{admin_api_ip,      "0.0.0.0"}.
+{admin_api_port,    8084}.
 
 {storage_backend,   "bitcask"}.
 

rel/pkg/deb/vars.config

@@ -24,6 +24,8 @@
 {handoff_port,      8099}.
 {pb_ip,             "127.0.0.1"}.
 {pb_port,           8087}.
+{admin_api_ip,      "0.0.0.0"}.
+{admin_api_port,    8084}.
 
 {storage_backend,   "bitcask"}.
 

rel/pkg/rpm/vars.config.part

@@ -16,6 +16,8 @@
 {handoff_port,      8099}.
 {pb_ip,             "127.0.0.1"}.
 {pb_port,           8087}.
+{admin_api_ip,      "0.0.0.0"}.
+{admin_api_port,    8084}.
 
 {storage_backend,   "bitcask"}.
 

rel/vars.config

@@ -24,6 +24,8 @@
 {handoff_ip,            "0.0.0.0"}.
 {pb_ip,                 "127.0.0.1"}.
 {pb_port,               8087}.
+{admin_api_ip,          "0.0.0.0"}.
+{admin_api_port,        8084}.
 {storage_backend,   "bitcask"}.
 {sasl_error_log,    "{{platform_log_dir}}/sasl-error.log"}.
 {sasl_log_dir,      "{{platform_log_dir}}/sasl"}.

rel/vars/dev_vars.config.src

@@ -26,6 +26,8 @@
 {handoff_port,      @HANDOFFPORT@}.
 {pb_ip,             "127.0.0.1"}.
 {pb_port,           @PBPORT@}.
+{admin_api_ip,      "0.0.0.0"}.
+{admin_api_port,    @ADMINAPIPORT@}.
 {storage_backend,   "bitcask"}.
 {sasl_error_log,    "{{platform_log_dir}}/sasl-error.log"}.
 {sasl_log_dir,      "{{platform_log_dir}}/sasl"}.

rel/vars/perf_vars.config.src

@@ -19,6 +19,8 @@
 {handoff_port,      8090}.
 {pb_ip,             "127.0.0.1"}.
 {pb_port,           8081}.
+{admin_api_ip,      "0.0.0.0"}.
+{admin_api_port,    8084}.
 {storage_backend,   "yessir"}.
 {ring_state_dir,    "{{platform_data_dir}}/ring"}.
 {bitcask_data_root, "{{platform_data_dir}}/bitcask"}.