Update pipe_verify_handoff_blocking to handle vnode shutdown

README.md

@@ -14,7 +14,7 @@ contents of `$HOME/rt/riak` might look something like this:
 
 ```
 $ ls $HOME/rt/riak
-current riak-1.2.1 riak-1.3.2 riak-1.4.10
+current riak-1.4.12 riak-2.0.2 riak-2.0.4 riak-2.0.6
 ```
 
 Inside each of these directories is a `dev` folder, typically
@@ -73,7 +73,7 @@ The first one that we want to look at is `rtdev-build-releases.sh`. If
 left unchanged, this script is going to do the following:
 
 1. Download the source for the past three major Riak versions (e.g.
-   1.3.2, 1.4.10 and 2.0.0)
+   1.4.12, 2.0.6 and 2.1.2)
 1. Build the proper version of Erlang that release was built with,
    using kerl (which it will also download)
 1. Build those releases of Riak.
@@ -113,14 +113,6 @@ same directory that you just built all of your releases into.
 By default this script initializes the repository into `$HOME/rt/riak` but
 you can override [`$RT_DEST_DIR`](https://github.com/basho/riak_test/blob/master/bin/rtdev-setup-releases.sh#L11).
 
-**Note**: There is a bug in 1.3.x `leveldb` which does not properly resolve
-the location of `pthread.h` when building on Macintosh OS X 10.9, aka
-Mavericks.  This has been fixed in subsequent releases, but for now a fix
-is to manually add `#include <pthread.h>` to the top of
-`deps/eleveldb/c_src/leveldb/include/leveldb/env.h`.  Also the version
-of `meck` needs to be updated, too.  This is handled autmatically by
-the script.
-
 ### rtdev-current.sh
 
 `rtdev-current.sh` is where it gets interesting. You need to run that
@@ -188,8 +180,10 @@ to tell riak_test about them. The method of choice is to create a
     {rt_project, "riak"},
     {rtdev_path, [{root,     "/home/you/rt/riak"},
                   {current,  "/home/you/rt/riak/current"},
-                  {previous, "/home/you/rt/riak/riak-1.4.10"},
-                  {legacy,   "/home/you/rt/riak/riak-1.3.2"}
+                  {previous, "/home/you/rt/riak/riak-2.0.6"},
+                  {legacy,   "/home/you/rt/riak/riak-1.4.12"},
+                  {'2.0.2',   "/home/you/rt/riak/riak-2.0.2"},
+                  {'2.0.4',   "/home/you/rt/riak/riak-2.0.4"}
                  ]}
 ]}.
 ```
@@ -234,7 +228,9 @@ Tests that do not include coverage annotations will, if cover is enabled, honor
 #### Web hooks
 When reporting is enabled, each test result is posted to [Giddy Up](http://giddyup.basho.com). You can specify
 any number of webhooks that will also receive a POST request with JSON formatted test information, plus the URL
-of the Giddy Up resource page.  
+of the Giddy Up resource page.
+
+N.B.: This configuration setting is optional, and *NOT* required any more for GiddyUp.
 
 ```erlang
     {webhooks, [

bin/rtdev-all.sh

@@ -4,7 +4,7 @@ ORIGDIR=`pwd`
 pushd `dirname $0` > /dev/null
 SCRIPT_DIR=`pwd`
 popd > /dev/null
-: ${CURRENT_OTP:=$HOME/erlang-R16B02}
+: ${CURRENT_OTP:="$HOME/erlang-R16B02"}
 : ${RT_CURRENT_TAG:=""}
 
 

bin/rtdev-build-releases.sh

@@ -19,11 +19,19 @@
 : ${R15B01:=$HOME/erlang-R15B01}
 : ${R16B02:=$HOME/erlang-R16B02}
 
+# These are the default tags to use when building basho OTP releases.
+# Export different tags to get a different build. N.B. You will need to
+# remove the builds from kerl (e.g., kerl delete build $BUILDNAME) and
+# possibly remove the directories above.
+: ${R16_TAG:="OTP_R16B02_basho9"}
+: ${R15_TAG:="basho_OTP_R15B01p"}
+
 # By default the Open Source version of Riak will be used, but for internal
 # testing you can override this variable to use `riak_ee` instead
 : ${RT_USE_EE:=""}
 GITURL_RIAK="git://github.com/basho/riak"
 GITURL_RIAK_EE="[email protected]:basho/riak_ee"
+GITDIR="riak-src"
 
 
 checkbuild()
@@ -44,7 +52,7 @@ checkbuild()
                     echo "You need 'curl' to be able to run this script, exiting"
                     exit 1
                 fi
-                curl -O https://raw.github.com/spawngrid/kerl/master/kerl > /dev/null 2>&1; chmod a+x kerl
+                curl -O https://raw.githubusercontent.com/spawngrid/kerl/master/kerl > /dev/null 2>&1; chmod a+x kerl
             fi
         fi
     fi
@@ -55,16 +63,40 @@ kerl()
     RELEASE=$1
     BUILDNAME=$2
 
+    export CFLAGS="-g -O2"
+    export LDFLAGS="-g"
+    if [ -n "`uname -r | grep el6`" ]; then
+        export CFLAGS="-g -DOPENSSL_NO_EC=1"
+    fi
+    BUILDFLAGS="--disable-hipe --enable-smp-support --without-odbc"
+    if [ $(uname -s) = "Darwin" ]; then
+        export CFLAGS="-g -O0"
+        BUILDFLAGS="$BUILDFLAGS --enable-darwin-64bit --with-dynamic-trace=dtrace"
+    else
+        BUILDFLAGS="$BUILDFLAGS --enable-m64-build"
+    fi
+
+    KERL_ENV="KERL_CONFIGURE_OPTIONS=${BUILDFLAGS}"
+    MAKE="make -j10"
+
     echo " - Building Erlang $RELEASE (this could take a while)"
-    ./kerl build $RELEASE $BUILDNAME  > /dev/null 2>&1
+    # Use the Basho-patched version of Erlang 
+    if [ "$RELEASE" == "R15B01" ]; then
+        BUILD_CMD="./kerl build git git://github.com/basho/otp.git $R15_TAG $BUILDNAME"
+    elif [ "$RELEASE" == "R16B02" ]; then
+        BUILD_CMD="./kerl build git git://github.com/basho/otp.git $R16_TAG $BUILDNAME"
+    else
+        BUILD_CMD="./kerl build $RELEASE $BUILDNAME"
+    fi
+    env "$KERL_ENV" "MAKE=$MAKE" $BUILD_CMD
     RES=$?
     if [ "$RES" -ne 0 ]; then
         echo "[ERROR] Kerl build $BUILDNAME failed"
         exit 1
     fi
 
     echo " - Installing $RELEASE into $HOME/$BUILDNAME"
-    ./kerl install $BUILDNAME $HOME/$BUILDNAME  > /dev/null 2>&1
+    ./kerl install $BUILDNAME "$HOME/$BUILDNAME" > /dev/null 2>&1
     RES=$?
     if [ "$RES" -ne 0 ]; then
         echo "[ERROR] Kerl install $BUILDNAME failed"
@@ -77,6 +109,12 @@ build()
     SRCDIR=$1
     ERLROOT=$2
     TAG="$3"
+    if [ -z $4 ]; then
+        LOCKED_DEPS=true
+    else
+        LOCKED_DEPS=$4
+    fi
+
     if [ -z "$RT_USE_EE" ]; then
         GITURL=$GITURL_RIAK
         GITTAG=riak-$TAG
@@ -85,6 +123,15 @@ build()
         GITTAG=riak_ee-$TAG
     fi
 
+    echo "Getting sources from github"
+    if [ ! -d $GITDIR ]; then
+        git clone $GITURL $GITDIR
+    else
+        cd $GITDIR
+        git pull origin develop
+        cd ..
+    fi
+
     echo "Building $SRCDIR:"
 
     checkbuild $ERLROOT
@@ -94,83 +141,53 @@ build()
         kerl $RELEASE $BUILDNAME
     fi
 
-    GITRES=1
-    echo " - Cloning $GITURL"
-    rm -rf $SRCDIR
-    git clone $GITURL $SRCDIR
-    GITRES=$?
-    if [ $GITRES -eq 0 -a -n "$TAG" ]; then
-        cd $SRCDIR
-        git checkout $GITTAG
+    if [ ! -d $SRCDIR ]
+    then
+        GITRES=1
+        echo " - Cloning $GITURL"
+        git clone $GITDIR $SRCDIR
         GITRES=$?
-        cd ..
+        if [ $GITRES -eq 0 -a -n "$TAG" ]; then
+            cd $SRCDIR
+            git checkout $GITTAG
+            GITRES=$?
+            cd ..
+        fi
     fi
 
-    RUN="env PATH=$ERLROOT/bin:$ERLROOT/lib/erlang/bin:$PATH \
+    if [ ! -f "$SRCDIR/built" ]
+    then
+
+        RUN="env PATH=$ERLROOT/bin:$ERLROOT/lib/erlang/bin:$PATH \
              C_INCLUDE_PATH=$ERLROOT/usr/include \
              LD_LIBRARY_PATH=$ERLROOT/usr/lib"
-    fix_riak_1_3 $SRCDIR $TAG "$RUN"
-
-    echo " - Building stagedevrel in $SRCDIR (this could take a while)"
-    cd $SRCDIR
 
-    $RUN make all stagedevrel
-    RES=$?
-    if [ "$RES" -ne 0 ]; then
-        echo "[ERROR] make stagedevrel failed"
-        exit 1
-    fi
-    cd ..
-    echo " - $SRCDIR built."
-}
+        echo " - Building devrel in $SRCDIR (this could take a while)"
+        cd $SRCDIR
 
-# Riak 1.3 has a few artifacts which need to be updated in order to build
-# properly
-fix_riak_1_3()
-{
-	SRCDIR=$1
-	TAG="$2"
-	RUN="$3"
+        if $LOCKED_DEPS
+        then
+            CMD="make locked-deps devrel"
+        else
+            CMD="make all devrel"
+        fi
 
-    if [ "`echo $TAG | cut -d . -f1-2`" != "1.3" ]; then
-        return 0
+        $RUN $CMD
+        RES=$?
+        if [ "$RES" -ne 0 ]; then
+            echo "[ERROR] make devrel failed"
+            exit 1
+        fi
+        touch built
+        cd ..
+        echo " - $SRCDIR built."
+    else
+        echo " - already built"
     fi
-
-    echo "- Patching Riak 1.3.x"
-    cd $SRCDIR
-    cat <<EOF | patch
---- rebar.config
-+++ rebar.config
-@@ -12,6 +12,7 @@
- {deps, [
-        {lager_syslog, "1.2.2", {git, "git://github.com/basho/lager_syslog", {tag, "1.2.2"}}},
-        {cluster_info, "1.2.3", {git, "git://github.com/basho/cluster_info", {tag, "1.2.3"}}},
-+       {meck, "0.7.2", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}},
-        {riak_kv, "1.3.2", {git, "git://github.com/basho/riak_kv", {tag, "1.3.2"}}},
-        {riak_search, "1.3.0", {git, "git://github.com/basho/riak_search",
-                                  {tag, "1.3.2"}}},
-EOF
-    $RUN make deps
-    cd deps/eleveldb/c_src/leveldb/include/leveldb
-    cat <<EOF | patch
---- env.h
-+++ env.h
-@@ -17,6 +17,7 @@
- #include <string>
- #include <vector>
- #include <stdint.h>
-+#include <pthread.h>
- #include "leveldb/perf_count.h"
- #include "leveldb/status.h"
-EOF
-    cd ../../../../../../..
 }
 
-build "riak-1.4.10" $R15B01 http://s3.amazonaws.com/downloads.basho.com/riak/1.4/1.4.10/riak-1.4.10.tar.gz
-echo
-if [ -z "$RT_USE_EE" ]; then
-	build "riak-1.3.2" $R15B01 1.3.2
-else
-	build "riak-1.3.4" $R15B01 1.3.4
-fi
+build "riak-1.4.12" $R15B01 1.4.12 false
+build "riak-2.0.2" $R16B02 2.0.2
+build "riak-2.0.4" $R16B02 2.0.4
+build "riak-2.0.6" $R16B02 2.0.6
 echo

bin/rtdev-setup-releases.sh

@@ -24,6 +24,8 @@ then
         echo " - Initializing $RT_DEST_DIR/$vsn"
         mkdir -p "$RT_DEST_DIR/$vsn"
         cp -p -P -R "$rel" "$RT_DEST_DIR/$vsn"
+        # Route out the product and version from Git
+        (cd "$rel"; VERSION="$(git describe --tags)"; echo -n $VERSION > $RT_DEST_DIR/$vsn/VERSION)
     done
 else
     # This is useful when only testing with 'current'

intercepts/hashtree_intercepts.erl

@@ -1,3 +1,23 @@
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2015 Basho Technologies, Inc.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+%%-------------------------------------------------------------------
+
 -module(hashtree_intercepts).
 -compile(export_all).
 -include("intercept.hrl").

intercepts/init_intercepts.erl

@@ -1,3 +1,23 @@
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2015 Basho Technologies, Inc.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+%%-------------------------------------------------------------------
+
 -module(init_intercepts).
 -compile(export_all).
 -include("intercept.hrl").