upgrade rebar3 to 3.17 plus git revlist fix

See TI-Tokyo/rebar3@48344c200353c

It comes with a new relx which allows for many simplifications in the
launcher script:

 * The riak script it generates has rpc facility built in.
 * No need to supply dummy sys.config and vm.args.

We do, however, need to write and delete the pid file ourselves.

Author: Andrei Zavada

Makefile

@@ -30,7 +30,7 @@ compile:
 
 deps:
 	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the compile target"))
-	$(REBAR) upgrade
+	$(REBAR) upgrade --all
 
 clean: testclean
 	$(REBAR) clean

rebar.config

@@ -46,7 +46,7 @@
     ]}
 ]}.
 
-{relx, [{release, {riak, "3.0.9"},
+{relx, [{release, {riak, "3.0.9.1"},
     [kernel,
      stdlib,
      lager,

rebar.lock

@@ -1,4 +1,4 @@
-{"1.1.0",
+{"1.2.0",
 [{<<"basho_stats">>,
   {git,"https://github.com/basho/basho_stats.git",
        {ref,"c5b7ecb92af7b050bc62d08c6fbf1aafd6bdeff0"}},
@@ -180,5 +180,12 @@
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"hut">>, <<"08D46679523043424870723923971889E8A34D63B2F946A35B46CF921D1236E7">>},
  {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
- {<<"setup">>, <<"1203F4CDA11306C2E34434244576DED0A7BBFB0908D9A572356C809BD0CDF085">>}]}
+ {<<"setup">>, <<"1203F4CDA11306C2E34434244576DED0A7BBFB0908D9A572356C809BD0CDF085">>}]},
+{pkg_hash_ext,[
+ {<<"bear">>, <<"534217DCE6A719D59E54FB0EB7A367900DBFC5F85757E8C1F94269DF383F6D9B">>},
+ {<<"folsom">>, <<"F7B644FC002A75AF00B8BFBD3CC5C2BD955E09A118D2982D9A6C04E5646FF367">>},
+ {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
+ {<<"hut">>, <<"953FC447514BAF9CC79FA147D66469243C94DFA1593779614E070C692D0BF0F3">>},
+ {<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
+ {<<"setup">>, <<"7D6AAF5281D0B0C40980E128F9DC410DACD03799A8577201D4C8B43E7F97509A">>}]}
 ].

rebar3

@@ -1,57 +1,75 @@
 #!/bin/bash
 
-RUNNER_GEN_DIR="${RUNNER_GEN_DIR:-{{ platform_gen_dir }}}"
-RELEASE_ROOT_DIR="${RELEASE_ROOT_DIR:-{{ runner_base_dir }}}"
+RUNNER_GEN_DIR={{platform_gen_dir}}
+RELX_RIAK={{platform_bin_dir}}/riak
 PID_DIR={{pid_dir}}
-COMMAND={{platform_bin_dir}}/riak
-DEBUG_COMMAND={{platform_bin_dir}}/riak-debug
-RUNNER_LOG_DIR={{platform_log_dir}}
-RELX_CONFIG_PATH=${RUNNER_GEN_DIR}/sys.config
-VMARGS_PATH=${RUNNER_GEN_DIR}/vm.args
+PIPE_DIR={{pipe_dir}}/   # terminating / (relx treats it as a prefix)
 
+mkdir -p $PID_DIR $PIPE_DIR
+chown riak:riak $PID_DIR $PIPE_DIR
 
-# On first running the sys.config and vm.args will not be a link
-# as cfconfig has not yet been run as a pre_start hook.  If there's no
-# link use the default for now
-if [ ! -L $RELX_CONFIG_PATH ]; then
-    cp $RELEASE_ROOT_DIR/releases/{{release_version}}/sys.config $RELX_CONFIG_PATH
-fi
-if [ ! -L $VMARGS_PATH ]; then
-    cp $RELEASE_ROOT_DIR/releases/{{release_version}}/vm.args $VMARGS_PATH
-fi
+function write_pid_file {  # relx doesn't seem to write the pid file, does it?
+    local c=3
+    sleep 1
+    while [[ $c -ne 0 ]]; do
+	if [ "`maybe_su ${RELX_RIAK} ping`" = "pong" ]; then
+	    maybe_su ${RELX_RIAK} pid >$PID_DIR/riak.pid
+            # systemd wants it to be owned by root, so:
+	    chown root:root $PID_DIR/riak.pid 2&>1 >/dev/null \
+                || true  # if we are run as non-root, just never mind
+	    break
+	fi
+	sleep 2
+	c=$(($c - 1))
+    done
+}
 
-# When running as a service, running as riak not as root, and systemd has created PID folder
-if [[ $EUID -ne 0 ]]; then
-    case "$1" in
-        start|console|foreground)
-            RELX_CONFIG_PATH=${RELX_CONFIG_PATH} VMARGS_PATH=${VMARGS_PATH} RUNNER_LOG_DIR=${RUNNER_LOG_DIR} PIPE_DIR=${PIPE_DIR} ${COMMAND} ${*} -pa {{platform_lib_dir}}/patches
-            ;;
-        *)
-            RELX_CONFIG_PATH=${RELX_CONFIG_PATH} VMARGS_PATH=${VMARGS_PATH} RUNNER_LOG_DIR=${RUNNER_LOG_DIR} PIPE_DIR=${PIPE_DIR} ${COMMAND} ${*}
-            ;;
-    esac
-else
-    # In this case we're running sudo riak - so have root access, but cannot rely
-    # systemd having created the PID dir, and need to sudo to the riak user
-    if [ ! -d $PID_DIR ]; then
-        mkdir $PID_DIR
-        chown riak:riak $PID_DIR
-    fi
-    case "$1" in
-        start|console|foreground)
-            su - riak -c "NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} RELX_CONFIG_PATH=${RELX_CONFIG_PATH} VMARGS_PATH=${VMARGS_PATH} RUNNER_LOG_DIR=${RUNNER_LOG_DIR} PIPE_DIR=${PIPE_DIR} ${COMMAND} ${*} -pa {{platform_lib_dir}}/patches"
-            ;;
-        debug)
-            # Drop the "debug" from the args as we're going to directly call riak-debug now
-            shift
-            # Debug may fail if run via relx script due to use of relative start location, and also need for root access
-            NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} RELX_CONFIG_PATH=${RELX_CONFIG_PATH} VMARGS_PATH=${VMARGS_PATH} RUNNER_LOG_DIR=${RUNNER_LOG_DIR} PIPE_DIR=${PIPE_DIR} ${DEBUG_COMMAND} ${*}
-            ;;
-        *)
-            ESCAPED_ARGS=`echo "$@" | sed -e 's/\([\\\(\\\){}"\x27]\)/\\\\\1/g'`
-            su - riak -c "NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} RELX_CONFIG_PATH=${RELX_CONFIG_PATH} VMARGS_PATH=${VMARGS_PATH} RUNNER_LOG_DIR=${RUNNER_LOG_DIR} PIPE_DIR=${PIPE_DIR} ${COMMAND} ${ESCAPED_ARGS}"
-            ;;
-    esac
-fi
+function delete_pid_file {
+    rm -f $PID_DIR/riak.pid
+}
 
+function maybe_su {
+    if [[ $EUID -ne 0 ]]; then
+        NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} PIPE_DIR=${PIPE_DIR} $*
+    else
+	# freebsd su is fairly limited, so:
+	f=$RUNNER_GEN_DIR/su_piggy
+	cat >$f <<EOF
+#!/bin/sh
+NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} PIPE_DIR=$PIPE_DIR $*
+EOF
+	chmod +x $f
+	su - riak $f
+    fi
+}
 
+case "$1" in
+    start)
+        maybe_su $RELX_RIAK $* -pa {{runner_patch_dir}} \
+            && write_pid_file
+	test -r $PID_DIR/riak.pid && exit 0
+	;;
+    console|foreground)
+        maybe_su $RELX_RIAK $* -pa {{runner_patch_dir}}
+	;;
+    stop)
+        maybe_su $RELX_RIAK $* \
+	    && delete_pid_file
+	;;
+    admin)
+	shift
+	maybe_su `which riak-admin` $*
+	;;
+    repl)
+	shift
+	maybe_su `which riak-repl` $*
+	;;
+    debug)
+	shift
+	maybe_su `which riak-debug` $*
+	;;
+    *)
+        ESCAPED_ARGS=`echo "$@" | sed -e 's/\([\\\(\\\){}"\x27]\)/\\\\\1/g'`
+        maybe_su $RELX_RIAK $ESCAPED_ARGS
+        ;;
+esac