From 5800829fc9a0751dcc41195550025f77aba7eb39 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 10:43:19 -0800
Subject: [PATCH 01/13] Remove Dockerfile and docker directory.

There's already a docker file at the root of the repository. In
addition, this Dockerfile would not work, since you can't create an
image by copying content from a directory outside, since you get the
following error:

  % docker build .
  ...
  Forbidden path outside the build context: .. ()
---
 docker/Dockerfile | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index f517914cc..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-#/**
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * 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.
-# */
-FROM java:8
-
-MAINTAINER Arvind Kandhare (arvind.kandhare@emc.com)
-
-COPY .. /opt/distributedlog-trunk/
-
-ENV BROKER_ID 0
-ENV ZK_SERVERS zk1:2181
-
-EXPOSE 3181 
-EXPOSE 9001 
-EXPOSE 4181 
-EXPOSE 20001
-
-CMD ["/opt/distributedlog-trunk/dist/release/vagrant/bk.sh", $BROKER_ID, "127.0.0.1", $ZK_SERVERS ]
- 
-
-

From 9bf33fc94b58b09b21a1d318c7001a04397b6225 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 10:45:54 -0800
Subject: [PATCH 02/13] Create a valid snapshot.

---
 scripts/snapshot | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/snapshot b/scripts/snapshot
index 2c9e285bb..2f2f7326b 100755
--- a/scripts/snapshot
+++ b/scripts/snapshot
@@ -32,7 +32,7 @@ rm -rf dist/*
 
 # create the layout
 for module in distributedlog-service distributedlog-benchmark distributedlog-tutorials/distributedlog-basic distributedlog-tutorials/distributedlog-messaging; do
-    mkdir -p "dist/release/${module}/{bin,conf,lib}"
+  mkdir -p "dist/release/${module}"/{bin,conf,lib}
 done
 
 # build the package
@@ -42,26 +42,27 @@ mvn clean install -Ptwitter-ostrich-provider -DskipTests
 cp -rf distributedlog-service/bin/* dist/release/distributedlog-service/bin
 cp -rf distributedlog-service/conf/* dist/release/distributedlog-service/conf
 cp -rf distributedlog-service/lib/* dist/release/distributedlog-service/lib
-cp -rf distributedlog-service/target/distributedlog-service-*.jar dist/release/distributedlog-service
+cp -rf distributedlog-service/target/distributedlog-service-*.jar dist/release/distributedlog-service/lib
 cp -rf vagrant dist/release/
+cp -rf scripts dist/release/
 
 # build the distributedlog-benchmark
 cp -rf distributedlog-benchmark/bin/* dist/release/distributedlog-benchmark/bin
 cp -rf distributedlog-benchmark/conf/* dist/release/distributedlog-benchmark/conf
 cp -rf distributedlog-benchmark/lib/* dist/release/distributedlog-benchmark/lib
-cp -rf distributedlog-benchmark/target/distributedlog-benchmark-*.jar dist/release/distributedlog-benchmark
+cp -rf distributedlog-benchmark/target/distributedlog-benchmark-*.jar dist/release/distributedlog-benchmark/lib
 
 # build the distributedlog-tutorial/basic
 cp -rf distributedlog-tutorials/distributedlog-basic/bin/* dist/release/distributedlog-tutorials/distributedlog-basic/bin
 cp -rf distributedlog-tutorials/distributedlog-basic/conf/* dist/release/distributedlog-tutorials/distributedlog-basic/conf
 cp -rf distributedlog-tutorials/distributedlog-basic/lib/* dist/release/distributedlog-tutorials/distributedlog-basic/lib
-cp -rf distributedlog-tutorials/distributedlog-basic/target/distributedlog-basic-*.jar dist/release/distributedlog-tutorials/distributedlog-basic
+cp -rf distributedlog-tutorials/distributedlog-basic/target/distributedlog-basic-*.jar dist/release/distributedlog-tutorials/distributedlog-basic/lib
 
 # build the distributedlog-tutorial/messaging
 cp -rf distributedlog-tutorials/distributedlog-messaging/bin/* dist/release/distributedlog-tutorials/distributedlog-messaging/bin
 cp -rf distributedlog-tutorials/distributedlog-messaging/conf/* dist/release/distributedlog-tutorials/distributedlog-messaging/conf
 cp -rf distributedlog-tutorials/distributedlog-messaging/lib/* dist/release/distributedlog-tutorials/distributedlog-messaging/lib
-cp -rf distributedlog-tutorials/distributedlog-messaging/target/distributedlog-messaging-*.jar dist/release/distributedlog-tutorials/distributedlog-messaging
+cp -rf distributedlog-tutorials/distributedlog-messaging/target/distributedlog-messaging-*.jar dist/release/distributedlog-tutorials/distributedlog-messaging/lib
 
 # release
 cd dist/release

From 179eddc269653608750ab9c344205f52d4315553 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 13:55:29 -0800
Subject: [PATCH 03/13] Ignore .vagrant directory created by vagrant.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3b719cd6f..8f31919f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ lib/
 *.#*
 dist/
 logs/
+
+# vagrant
+.vagrant

From a7ac7c051fcae3c86e785298c29c736d575580d4 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 13:56:26 -0800
Subject: [PATCH 04/13] Git ignore pid files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8f31919f6..914de4103 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ lib/
 *.#*
 dist/
 logs/
+*.pid
 
 # vagrant
 .vagrant

From 480bc348694a19fc0be9e78d1f83a45e08e609e8 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 14:17:18 -0800
Subject: [PATCH 05/13] Remove comment from Dockerfile

Remove trailing white spaces too.
---
 Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0c90ae47..f45e35549 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,13 +24,9 @@ COPY . /opt/distributedlog-trunk/
 ENV BROKER_ID 0
 ENV ZK_SERVERS zk1:2181
 
-EXPOSE 3181 
-EXPOSE 9001 
-EXPOSE 4181 
+EXPOSE 3181
+EXPOSE 9001
+EXPOSE 4181
 EXPOSE 20001
 
-#CMD ["/bin/bash", "-c", "/opt/distributedlog-trunk/dist/release/vagrant/bk.sh", "$BROKER_ID", "127.0.0.1", "$ZK_SERVERS" ]
 ENTRYPOINT [ "/opt/distributedlog-trunk/dist/release/vagrant/bk_docker_wrapper.sh" ]
- 
-
-

From 21d89f8e93d0110bb92f7adc4f85e7e17a490489 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 14:28:15 -0800
Subject: [PATCH 06/13] Do not assume git is available in the shell scripts.

Almost all the shell scripts were using `git` to figure out the root
directory of distributedlog, but we can't assume it is available on the
host. We could also not have a .git directory if the package is shipped
in a tarball or other package format.

Reformat some of the scripts to use consistent indentation level.
---
 distributedlog-benchmark/bin/bundle       |   3 +-
 distributedlog-benchmark/bin/dbench       |   3 +-
 distributedlog-core/bin/dlog              |   3 +-
 distributedlog-service/bin/bundle         |   3 +-
 distributedlog-service/bin/dlog           |  10 +-
 distributedlog-service/bin/dlog-daemon.sh | 170 +++++++++++-----------
 scripts/common.sh                         |   4 +-
 scripts/runner                            |   3 +-
 vagrant/base.sh                           |  43 +++---
 vagrant/bk.sh                             |  64 ++++----
 vagrant/zk.sh                             |   5 +-
 11 files changed, 157 insertions(+), 154 deletions(-)

diff --git a/distributedlog-benchmark/bin/bundle b/distributedlog-benchmark/bin/bundle
index 838f74dfb..1d01e9171 100755
--- a/distributedlog-benchmark/bin/bundle
+++ b/distributedlog-benchmark/bin/bundle
@@ -20,6 +20,7 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 
 bash "${DLOG_ROOT}"/scripts/bundle benchmark
diff --git a/distributedlog-benchmark/bin/dbench b/distributedlog-benchmark/bin/dbench
index 42dd5b09e..1f90ce3cf 100755
--- a/distributedlog-benchmark/bin/dbench
+++ b/distributedlog-benchmark/bin/dbench
@@ -20,7 +20,8 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 
 DLOG_HOME="${DLOG_ROOT}/distributedlog-benchmark"
 
diff --git a/distributedlog-core/bin/dlog b/distributedlog-core/bin/dlog
index c4f9ed282..0d67fdfd1 100755
--- a/distributedlog-core/bin/dlog
+++ b/distributedlog-core/bin/dlog
@@ -20,7 +20,8 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 DLOG_HOME="${DLOG_ROOT}"
 
 usage() {
diff --git a/distributedlog-service/bin/bundle b/distributedlog-service/bin/bundle
index bd5b1a08e..7a5ce3e01 100755
--- a/distributedlog-service/bin/bundle
+++ b/distributedlog-service/bin/bundle
@@ -20,6 +20,7 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 
 bash "${DLOG_ROOT}"/scripts/bundle service
diff --git a/distributedlog-service/bin/dlog b/distributedlog-service/bin/dlog
index b9a01e1de..5a116118c 100755
--- a/distributedlog-service/bin/dlog
+++ b/distributedlog-service/bin/dlog
@@ -20,8 +20,8 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
-
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 DLOG_HOME="${DLOG_ROOT}"
 
 usage() {
@@ -49,16 +49,12 @@ These variable can also be set in conf/dlogenv.sh
 EOF
 }
 
-cd "${DLOG_ROOT}"
-source ./scripts/common.sh
+source "${DLOG_ROOT}"/../scripts/common.sh
 
 # get arguments
 COMMAND=$1
 shift
 
-#Change to DLOG_HOME to support relative paths
-cd "$DLOG_HOME"
-
 case "${COMMAND}" in
   local)
     exec java $OPTS $JMX_ARGS com.twitter.distributedlog.LocalDLMEmulator $@
diff --git a/distributedlog-service/bin/dlog-daemon.sh b/distributedlog-service/bin/dlog-daemon.sh
index e683da0e4..976d4f151 100755
--- a/distributedlog-service/bin/dlog-daemon.sh
+++ b/distributedlog-service/bin/dlog-daemon.sh
@@ -19,26 +19,25 @@
 # */
 
 usage() {
-    cat <<EOF
+  cat <<EOF
 Usage: dlog-daemon.sh (start|stop) <service> <args...>
 where service is one of:
-    zookeeper                   Run the zookeeper server
-    bookie                      Run the bookie server
-    bookie-rereplicator         Run the bookie rereplicator
-    writeproxy                  Run the write proxy server
-    writeproxy-monitor          Run the write proxy monitor
+  zookeeper                   Run the zookeeper server
+  bookie                      Run the bookie server
+  bookie-rereplicator         Run the bookie rereplicator
+  writeproxy                  Run the write proxy server
+  writeproxy-monitor          Run the write proxy monitor
 
 where argument is one of:
-    -force (accepted only with stop service): Decides whether to stop the process forcefully if not stopped by normal shutdown
+  -force (accepted only with stop service): Decides whether to stop the process forcefully if not stopped by normal shutdown
 EOF
 }
 
-BINDIR=`dirname "$0"`
-DL_HOME=`cd $BINDIR/..;pwd`
+BINDIR=$(dirname "$0")
+DL_HOME=$(cd $BINDIR/..;pwd)
 
-if [ -f $DL_HOME/conf/dlogenv.sh ]
-then
- . $DL_HOME/conf/dlogenv.sh
+if [ -f "${DL_HOME}/conf/dlogenv.sh" ]; then
+ . "${DL_HOME}/conf/dlogenv.sh"
 fi
 
 SERVICE_PORT=${SERVICE_PORT:-"0"}
@@ -47,56 +46,57 @@ SERVICE_ARGS=""
 # DLOG logging configuration
 DLOG_LOG_DIR=${DLOG_LOG_DIR:-"$DL_HOME/logs"}
 DLOG_ROOT_LOGGER=${DLOG_ROOT_LOGGER:-'INFO,R'}
+
 # Process Control Parameters
 DLOG_STOP_TIMEOUT=${DLOG_STOP_TIMEOUT:-30}
 DLOG_PID_DIR=${DLOG_PID_DIR:-$DL_HOME/pids}
 
-if [ $# -lt 2 ]
-then
-    echo "Error: no enough arguments provided."
-    usage
-    exit 1
+if [ $# -lt 2 ]; then
+  echo "Error: not enough arguments provided."
+  usage
+  exit 1
 fi
 
 command=$1
 shift
+
 service=$1
 shift
 
 service_class=$service
 case $service in
-    (zookeeper)
-        service_class="org.apache.zookeeper.server.quorum.QuorumPeerMain"
-        DLOG_ROOT_LOGGER=${ZK_ROOT_LOGGER:-'INFO,R'}
-        ;;
-    (bookie)
-        service_class="org.apache.bookkeeper.proto.BookieServer"
-        DLOG_ROOT_LOGGER=${BK_ROOT_LOGGER:-'INFO,R'}
-        ;;
-    (bookie-rereplicator)
-        service_class="org.apache.bookkeeper.replication.AutoRecoveryMain"
-        DLOG_ROOT_LOGGER=${BK_ROOT_LOGGER:-'INFO,R'}
-        ;;
-    (writeproxy)
-        service_class="com.twitter.distributedlog.service.DistributedLogServerApp"
-        DLOG_ROOT_LOGGER=${WP_ROOT_LOGGER:-'INFO,R'}
-        WP_CONF_FILE=${WP_CONF_FILE:-"$DL_HOME/conf/write_proxy.conf"}
-        WP_SERVICE_PORT=${WP_SERVICE_PORT:-'4181'}
-        WP_STATS_PORT=${WP_STATS_PORT:-'9000'}
-        WP_STATS_PROVIDER=${WP_STATS_PROVIDER:-'org.apache.bookkeeper.stats.CodahaleMetricsServletProvider'}
-        WP_SHARD_ID=${WP_SHARD_ID:-'0'}
-        WP_NAMESPACE=${WP_NAMESPACE:-'distributedlog://127.0.0.1:2181/messaging/distributedlog/mynamespace'}
-        SERVICE_PORT=${WP_SERVICE_PORT}
-        SERVICE_ARGS="--conf ${WP_CONF_FILE} --uri ${WP_NAMESPACE} --shard-id ${WP_SHARD_ID} --port ${WP_SERVICE_PORT} --stats-port ${WP_STATS_PORT} --stats-provider ${WP_STATS_PROVIDER} --announce --thriftmux"
-        DLOG_EXTRA_OPTS="${DLOG_EXTRA_OPTS} -DcodahaleStatsHttpPort=${WP_STATS_PORT} -Dserver_port=${WP_SERVICE_PORT} -Dserver_shard=${WP_SHARD_ID}"
-        ;;
-    (writeproxy-monitor)
-        ;;
-    (*)
-        echo "Error: unknown service name $service"
-        usage
-        exit 1
-        ;;
+  (zookeeper)
+    service_class="org.apache.zookeeper.server.quorum.QuorumPeerMain"
+    DLOG_ROOT_LOGGER=${ZK_ROOT_LOGGER:-'INFO,R'}
+    ;;
+  (bookie)
+    service_class="org.apache.bookkeeper.proto.BookieServer"
+    DLOG_ROOT_LOGGER=${BK_ROOT_LOGGER:-'INFO,R'}
+    ;;
+  (bookie-rereplicator)
+    service_class="org.apache.bookkeeper.replication.AutoRecoveryMain"
+    DLOG_ROOT_LOGGER=${BK_ROOT_LOGGER:-'INFO,R'}
+    ;;
+  (writeproxy)
+    service_class="com.twitter.distributedlog.service.DistributedLogServerApp"
+    DLOG_ROOT_LOGGER=${WP_ROOT_LOGGER:-'INFO,R'}
+    WP_CONF_FILE=${WP_CONF_FILE:-"$DL_HOME/conf/write_proxy.conf"}
+    WP_SERVICE_PORT=${WP_SERVICE_PORT:-'4181'}
+    WP_STATS_PORT=${WP_STATS_PORT:-'9000'}
+    WP_STATS_PROVIDER=${WP_STATS_PROVIDER:-'org.apache.bookkeeper.stats.CodahaleMetricsServletProvider'}
+    WP_SHARD_ID=${WP_SHARD_ID:-'0'}
+    WP_NAMESPACE=${WP_NAMESPACE:-'distributedlog://127.0.0.1:2181/messaging/distributedlog/mynamespace'}
+    SERVICE_PORT=${WP_SERVICE_PORT}
+    SERVICE_ARGS="--conf ${WP_CONF_FILE} --uri ${WP_NAMESPACE} --shard-id ${WP_SHARD_ID} --port ${WP_SERVICE_PORT} --stats-port ${WP_STATS_PORT} --stats-provider ${WP_STATS_PROVIDER} --announce --thriftmux"
+    DLOG_EXTRA_OPTS="${DLOG_EXTRA_OPTS} -DcodahaleStatsHttpPort=${WP_STATS_PORT} -Dserver_port=${WP_SERVICE_PORT} -Dserver_shard=${WP_SHARD_ID}"
+    ;;
+  (writeproxy-monitor)
+    ;;
+  (*)
+    echo "Error: unknown service name $service"
+    usage
+    exit 1
+    ;;
 esac
 
 echo "doing $command $service ..."
@@ -110,21 +110,20 @@ pid=$DLOG_PID_DIR/dlog-$service-$SERVICE_PORT.pid
 out=$DLOG_LOG_DIR/dlog-$service-$HOSTNAME-$SERVICE_PORT.out
 logfile=$DLOG_LOG_DIR/$DLOG_LOG_FILE
 
-rotate_out_log ()
-{
-    log=$1;
-    num=5;
-    if [ -n "$2" ]; then
-       num=$2
-    fi
-    if [ -f "$log" ]; then # rotate logs
-        while [ $num -gt 1 ]; do
-            prev=`expr $num - 1`
-            [ -f "$log.$prev" ] && mv "$log.$prev" "$log.$num"
-            num=$prev
-        done
-        mv "$log" "$log.$num";
-    fi
+rotate_out_log () {
+  log=$1;
+  num=5;
+  if [ -n "$2" ]; then
+   num=$2
+  fi
+  if [ -f "$log" ]; then # rotate logs
+    while [ $num -gt 1 ]; do
+      prev=`expr $num - 1`
+      [ -f "$log.$prev" ] && mv "$log.$prev" "$log.$num"
+      num=$prev
+    done
+    mv "$log" "$log.$num";
+  fi
 }
 
 mkdir -p "$DLOG_LOG_DIR"
@@ -133,8 +132,8 @@ mkdir -p "$DLOG_PID_DIR"
 case $command in
   (start)
     if [ -f $pid ]; then
-      if kill -0 `cat $pid` > /dev/null 2>&1; then
-        echo $service running as process `cat $pid`.  Stop it first.
+      if kill -0 $(cat $pid) > /dev/null 2>&1; then
+        echo $service running as process $(cat $pid).  Stop it first.
         exit 1
       fi
     fi
@@ -153,41 +152,36 @@ case $command in
 
   (stop)
     if [ -f $pid ]; then
-      TARGET_PID=`cat $pid`
+      TARGET_PID=$(cat $pid)
       if kill -0 $TARGET_PID > /dev/null 2>&1; then
         echo stopping $service
         kill $TARGET_PID
 
         count=0
         location=$DLOG_LOG_DIR
-        while ps -p $TARGET_PID > /dev/null;
-         do
+        while ps -p $TARGET_PID > /dev/null; do
           echo "Shutdown is in progress... Please wait..."
           sleep 1
-          count=`expr $count + 1`
-         
+          count=$(expr $count + 1)
           if [ "$count" = "$DLOG_STOP_TIMEOUT" ]; then
-                break
+            break
           fi
-         done
-        
+        done
         if [ "$count" != "$DLOG_STOP_TIMEOUT" ]; then
-            echo "Shutdown completed."
+          echo "Shutdown completed."
         fi
-                 
         if kill -0 $TARGET_PID > /dev/null 2>&1; then
-              fileName=$location/$service.out
-              $JAVA_HOME/bin/jstack $TARGET_PID > $fileName
-              echo Thread dumps are taken for analysis at $fileName
-              if [ "$1" == "-force" ]
-              then
-                 echo forcefully stopping $service
-                 kill -9 $TARGET_PID >/dev/null 2>&1
-                 echo Successfully stopped the process
-              else
-                 echo "WARNNING : $service is not stopped completely."
-                 exit 1
-              fi
+          fileName=$location/$service.out
+          $JAVA_HOME/bin/jstack $TARGET_PID > $fileName
+          echo Thread dumps are taken for analysis at $fileName
+          if [ "$1" == "-force" ]; then
+            echo forcefully stopping $service
+            kill -9 $TARGET_PID >/dev/null 2>&1
+            echo Successfully stopped the process
+          else
+            echo "WARNNING : $service is not stopped completely."
+            exit 1
+          fi
         fi
       else
         echo no $service to stop
diff --git a/scripts/common.sh b/scripts/common.sh
index 433f93bc7..83d2021ff 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -48,6 +48,7 @@ else
   echo "JMX disabled by user request" >&2
 fi
 
+echo "DLOG_HOME => ${DLOG_HOME}"
 DEFAULT_LOG_CONF="${DLOG_HOME}/conf/log4j.properties"
 
 [ -f "${DLOG_HOME}/conf/dlogenv.sh" ] && source "${DLOG_HOME}/conf/dlogenv.sh"
@@ -93,9 +94,8 @@ else
   add_maven_deps_to_classpath
 fi
 
-# if no args specified, show usage
+# if no args specified, exit
 if [ $# = 0 ]; then
-  usage
   exit 1
 fi
 
diff --git a/scripts/runner b/scripts/runner
index cc0594633..937829a1f 100755
--- a/scripts/runner
+++ b/scripts/runner
@@ -22,7 +22,8 @@
 
 set -e
 
-DLOG_ROOT=$(git rev-parse --show-toplevel)
+BASEDIR=$(dirname "$0")
+DLOG_ROOT="${BASEDIR}/.."
 
 DLOG_HOME="${DLOG_ROOT}/distributedlog-service"
 
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 03e348eda..21e616798 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -18,39 +18,40 @@
 set -e
 
 if [ -z $(which javac) ]; then
-    apt-get -y update
-    apt-get install -y  --no-install-recommends software-properties-common python-software-properties
-    add-apt-repository -y ppa:webupd8team/java
-    apt-get -y update
-
-    # Try to share cache. See Vagrantfile for details
-    mkdir -p /var/cache/oracle-jdk8-installer
-    if [ -e "/tmp/oracle-jdk8-installer-cache/" ]; then
-        find /tmp/oracle-jdk8-installer-cache/ -not -empty -exec cp '{}' /var/cache/oracle-jdk8-installer/ \;
-    fi
-
-    /bin/echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-    apt-get -y install --force-yes  --no-install-recommends oracle-java8-installer oracle-java8-set-default
-
-    if [ -e "/tmp/oracle-jdk8-installer-cache/" ]; then
-        cp -R /var/cache/oracle-jdk8-installer/* /tmp/oracle-jdk8-installer-cache
-    fi
+  apt-get -y update
+  apt-get install -y  --no-install-recommends software-properties-common python-software-properties
+  add-apt-repository -y ppa:webupd8team/java
+  apt-get -y update
+
+  # Try to share cache. See Vagrantfile for details
+  mkdir -p /var/cache/oracle-jdk8-installer
+  if [ -e "/tmp/oracle-jdk8-installer-cache/" ]; then
+    find /tmp/oracle-jdk8-installer-cache/ -not -empty -exec cp '{}' /var/cache/oracle-jdk8-installer/ \;
+  fi
+
+  /bin/echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+  apt-get -y install --force-yes  --no-install-recommends oracle-java8-installer oracle-java8-set-default maven2
+
+  if [ -e "/tmp/oracle-jdk8-installer-cache/" ]; then
+    cp -R /var/cache/oracle-jdk8-installer/* /tmp/oracle-jdk8-installer-cache
+  fi
 fi
 
 chmod a+rw /opt
 if [ -h /opt/distributedlog-trunk ]; then
-    # reset symlink
-    rm /opt/distributedlog-trunk
+  # reset symlink
+  rm /opt/distributedlog-trunk
 fi
-ln -s /vagrant /opt/distributedlog-trunk
 
+ln -s /vagrant /opt/distributedlog-trunk
 
 # For EC2 nodes, we want to use /mnt, which should have the local disk. On local
 # VMs, we can just create it if it doesn't exist and use it like we'd use
 # /tmp. Eventually, we'd like to also support more directories, e.g. when EC2
 # instances have multiple local disks.
 if [ ! -e /mnt ]; then
-    mkdir /mnt
+  mkdir /mnt
 fi
+
 chmod a+rwx /mnt
 
diff --git a/vagrant/bk.sh b/vagrant/bk.sh
index 3c0009a7a..1eb5ab112 100755
--- a/vagrant/bk.sh
+++ b/vagrant/bk.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # Usage: bk.sh <broker ID> <public hostname or IP> <list zookeeper public hostname or IP + port>
 
 set -e
@@ -40,47 +39,54 @@ if [ ! -z $DEPLOY_BOTH ]; then
  DEPLOY_WP=true
 fi
 
-
 log_dir=/opt/distributedlog-trunk/dist/release
 cd $log_dir
 
 #Stop the running bookie
-echo "Killing server"
+echo "Killing bookkeeper server"
 ./distributedlog-service/bin/dlog-daemon.sh stop bookie
 
 cp ./distributedlog-service/conf/bookie.conf.template ./distributedlog-service/conf/bookie-$BROKER_ID.conf
 
 sed \
-    -e 's/zkServers=localhost:2181/'zkServers=$PUBLIC_ZOOKEEPER_ADDRESSES'/' \
-    ./distributedlog-service/conf/bookie.conf.template > ./distributedlog-service/conf/bookie-$BROKER_ID.conf
+  -e 's/zkServers=localhost:2181/'zkServers=$PUBLIC_ZOOKEEPER_ADDRESSES'/' \
+  ./distributedlog-service/conf/bookie.conf.template > ./distributedlog-service/conf/bookie-$BROKER_ID.conf
 
-sleep 5 
+sleep 5
 
 if [ $DEPLOY_BK == true ]; then
- if [ $BROKER_ID -eq "1" ]; then
-  echo "create /messaging" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES
-  echo "create /messaging/bookkeeper" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES 
-  echo "create /messaging/bookkeeper/ledgers" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES 
-  echo "Metafirmatting bookie"
-  export BOOKIE_CONF=$log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf 
-  echo "Y" |  ./distributedlog-service/bin/dlog bkshell metaformat
- fi
-
- echo "Configuring bookkeeper"
- BOOKIE_CONF=$log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf ./distributedlog-service/bin/dlog bkshell bookieformat
-
- echo "Starting server"
- SERVICE_PORT=3181 ./distributedlog-service/bin/dlog-daemon.sh start bookie -c $log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf
-
-
- if [ $BROKER_ID -eq "1" ]; then
- ./distributedlog-service/bin/dlog admin bind -dlzr $PUBLIC_ZOOKEEPER_ADDRESSES -dlzw $PUBLIC_ZOOKEEPER_ADDRESSES -s $PUBLIC_ZOOKEEPER_ADDRESSES -bkzr $PUBLIC_ZOOKEEPER_ADDRESSES \
-       -l /messaging/bookkeeper/ledgers -i false -r true -c distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace
- fi
-
+  if [ $BROKER_ID -eq "1" ]; then
+    echo "create /messaging" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES
+    echo "create /messaging/bookkeeper" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES
+    echo "create /messaging/bookkeeper/ledgers" | ./distributedlog-service/bin/dlog zkshell $PUBLIC_ZOOKEEPER_ADDRESSES
+    echo "Metaformatting bookie"
+    export BOOKIE_CONF=$log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf
+    ./distributedlog-service/bin/dlog bkshell metaformat -n -f
+  fi
+
+  echo "Configuring bookkeeper"
+  BOOKIE_CONF=$log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf ./distributedlog-service/bin/dlog bkshell bookieformat
+
+  echo "Starting server"
+  SERVICE_PORT=3181 ./distributedlog-service/bin/dlog-daemon.sh start bookie -c $log_dir/distributedlog-service/conf/bookie-$BROKER_ID.conf
+
+  if [ $BROKER_ID -eq "1" ]; then
+    ./distributedlog-service/bin/dlog admin bind \
+      -dlzr $PUBLIC_ZOOKEEPER_ADDRESSES \
+      -dlzw $PUBLIC_ZOOKEEPER_ADDRESSES \
+      -s $PUBLIC_ZOOKEEPER_ADDRESSES \
+      -bkzr $PUBLIC_ZOOKEEPER_ADDRESSES \
+      -l /messaging/bookkeeper/ledgers \
+      -i false \
+      -r true \
+      -c distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace
+  fi
 fi
 
-
 if [ $DEPLOY_WP == true ]; then
- WP_NAMESPACE=distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace WP_SHARD_ID=$BROKER_ID WP_SERVICE_PORT=4181 WP_STATS_PORT=20001 ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
+  WP_NAMESPACE=distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace \
+    WP_SHARD_ID=$BROKER_ID \
+    WP_SERVICE_PORT=4181 \
+    WP_STATS_PORT=20001 \
+    ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
 fi
diff --git a/vagrant/zk.sh b/vagrant/zk.sh
index 3d5d5de2e..c69014908 100755
--- a/vagrant/zk.sh
+++ b/vagrant/zk.sh
@@ -30,9 +30,9 @@ echo "initLimit=5" >> $log_dir/distributedlog-service/conf/zookeeper-$ZKID.prope
 echo "syncLimit=2" >> $log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties
 echo "quorumListenOnAllIPs=true" >> $log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties
 sed  '/server.1/d' \
-    ./distributedlog-service/conf/bookie.conf.template > ./distributedlog-service/conf/zookeeper-$ZKID.conf
+  ./distributedlog-service/conf/bookie.conf.template > ./distributedlog-service/conf/zookeeper-$ZKID.conf
 for i in $(seq 1 $NUM_ZK); do
-    echo "server.${i}=zk${i}:2888:3888" >>$log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties
+  echo "server.${i}=zk${i}:2888:3888" >>$log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties
 done
 
 mkdir -p /tmp/data/zookeeper
@@ -41,6 +41,7 @@ echo "$ZKID" > /tmp/data/zookeeper/myid
 echo "Killing ZooKeeper"
 ./distributedlog-service/bin/dlog-daemon.sh stop zookeeper || true
 sleep 5
+
 echo "Starting ZooKeeper"
 echo "./distributedlog-service/bin/dlog-daemon.sh start zookeeper $log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties"
 ./distributedlog-service/bin/dlog-daemon.sh start zookeeper $log_dir/distributedlog-service/conf/zookeeper-$ZKID.properties

From 27f90f13aed5ce87c171024402d05a7975a8ac26 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 14:30:26 -0800
Subject: [PATCH 07/13] Rename bookkeeper hosts from node to bk.

It is more obvious than the generic name.
---
 Vagrantfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1aa733e51..ca467855d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,7 +34,6 @@ if File.exists?(local_config_file) then
   eval(File.read(local_config_file), binding, "Vagrantfile.local")
 end
 
-# TODO(ksweeney): RAM requirements are not empirical and can probably be significantly lowered.
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.hostmanager.enabled = enable_hostmanager
   config.hostmanager.manage_host = enable_dns
@@ -92,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   }
 
   (1..num_hosts).each { |i|
-    name = "node" + i.to_s
+    name = "bk" + i.to_s
     config.vm.define name do |broker|
       name_node(broker, name)
       ip_address = "192.168.50." + (50 + i).to_s
@@ -106,6 +105,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       broker.vm.provision "shell", path: "vagrant/bk.sh", :args => [i.to_s, enable_dns ? name : ip_address, zookeeper_connect]
     end
   }
-
-
 end

From a3fc4ef3c85f053b6433b87b64ce72fc7a295659 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Mon, 12 Dec 2016 14:31:11 -0800
Subject: [PATCH 08/13] Remove trailing white spaces in the doc

---
 docs/admin_guide/vagrant.rst |  4 +--
 docs/deployment/cluster.rst  | 58 +++++++++++++++++++-----------------
 docs/deployment/docker.rst   |  2 +-
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/docs/admin_guide/vagrant.rst b/docs/admin_guide/vagrant.rst
index 70e6fb0ef..e4ed574ac 100644
--- a/docs/admin_guide/vagrant.rst
+++ b/docs/admin_guide/vagrant.rst
@@ -13,6 +13,6 @@ Steps
 1. Create a snapshot using ./scripts/snapshot
 2. Run vagrant up from the root directory of the enlistment
 3. Vagrant brings up a zookeepers with machine names: zk1,zk2, .... with IP addresses 192.168.50.11,192.168.50.12,....
-4. Vagrant brings the bookies with machine names: node1,node2, ... with IP addresses 192.168.50.51,192.168.50.52,....
-5. The script will also start writeproxies at distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace as the namespace. If you want it to point to a different namespace/port/shard, please update the ./vagrant/bk.sh script. 
+4. Vagrant brings the bookies with machine names: bk1,bk2, ... with IP addresses 192.168.50.51,192.168.50.52,....
+5. The script will also start writeproxies at distributedlog://$PUBLIC_ZOOKEEPER_ADDRESSES/messaging/distributedlog/mynamespace as the namespace. If you want it to point to a different namespace/port/shard, please update the ./vagrant/bk.sh script.
 6. If you want to run the client on the host machine, please add these node names and their IP addresses to the /etc/hosts file on the host.
diff --git a/docs/deployment/cluster.rst b/docs/deployment/cluster.rst
index 8dcd4617e..250ba3c2a 100644
--- a/docs/deployment/cluster.rst
+++ b/docs/deployment/cluster.rst
@@ -38,8 +38,9 @@ Or run `./scripts/snapshot` to build the release packages from current source. T
 packages contain the binaries for running `distributedlog-service`, `distributedlog-benchmark`
 and `distributedlog-tutorials`.
 
-NOTE: we run following instructions from distributedlog source code after running `mvn clean install`.
-And assume `DL_HOME` is the directory of distributedlog source.
+NOTE: we run the following instructions from distributedlog source code after
+running `mvn clean install`.  And assume `DL_HOME` is the directory of
+distributedlog source.
 
 Zookeeper
 ---------
@@ -118,9 +119,10 @@ First of all, choose the zookeeper cluster that the bookies will use and set `zk
 the configuration files.
 
 ::
-    
+
     zkServers=localhost:2181
 
+
 Choose the zookeeper path to store bookkeeper metadata and set `zkLedgersRootPath` in the configuration
 files. Let's use `/messaging/bookkeeper/ledgers` in this instruction.
 
@@ -159,7 +161,7 @@ So using `zkshell` to create the `zkLedgersRootPath`.
 If the `zkLedgersRootPath`, run `metaformat` to format the bookkeeper metadata.
 
 ::
-    
+
     $ BOOKIE_CONF=${DL_HOME}/distributedlog-service/conf/bookie-1.conf ./distributedlog-service/bin/dlog bkshell metaformat
     Are you sure to format bookkeeper metadata ? (Y or N) Y
 
@@ -176,7 +178,7 @@ Configure the ports that used by bookies.
 bookie-1:
 
 ::
-   
+
     # Port that bookie server listen on
     bookiePort=3181
     # Exporting codahale stats
@@ -185,7 +187,7 @@ bookie-1:
 bookie-2:
 
 ::
-   
+
     # Port that bookie server listen on
     bookiePort=3182
     # Exporting codahale stats
@@ -194,7 +196,7 @@ bookie-2:
 bookie-3:
 
 ::
-   
+
     # Port that bookie server listen on
     bookiePort=3183
     # Exporting codahale stats
@@ -206,7 +208,7 @@ Configure Disk Layout
 Configure the disk directories used by a bookie server by setting following options.
 
 ::
-    
+
     # Directory Bookkeeper outputs its write ahead log
     journalDirectory=/tmp/data/bk/journal
     # Directory Bookkeeper outputs ledger snapshots
@@ -219,7 +221,7 @@ As we are configuring a 3-nodes bookkeeper cluster, we modify the following sett
 bookie-1:
 
 ::
-    
+
     # Directory Bookkeeper outputs its write ahead log
     journalDirectory=/tmp/data/bk-1/journal
     # Directory Bookkeeper outputs ledger snapshots
@@ -230,7 +232,7 @@ bookie-1:
 bookie-2:
 
 ::
-    
+
     # Directory Bookkeeper outputs its write ahead log
     journalDirectory=/tmp/data/bk-2/journal
     # Directory Bookkeeper outputs ledger snapshots
@@ -241,7 +243,7 @@ bookie-2:
 bookie-3:
 
 ::
-    
+
     # Directory Bookkeeper outputs its write ahead log
     journalDirectory=/tmp/data/bk-3/journal
     # Directory Bookkeeper outputs ledger snapshots
@@ -256,7 +258,7 @@ Once the disk directories are configured correctly in the configuration file, us
 `bkshell bookieformat` to format the bookie.
 
 ::
-    
+
     BOOKIE_CONF=${DL_HOME}/distributedlog-service/conf/bookie-1.conf ./distributedlog-service/bin/dlog bkshell bookieformat
     BOOKIE_CONF=${DL_HOME}/distributedlog-service/conf/bookie-2.conf ./distributedlog-service/bin/dlog bkshell bookieformat
     BOOKIE_CONF=${DL_HOME}/distributedlog-service/conf/bookie-3.conf ./distributedlog-service/bin/dlog bkshell bookieformat
@@ -268,16 +270,16 @@ Start bookie
 Start the bookie using `dlog-daemon.sh`.
 
 ::
-    
+
     SERVICE_PORT=3181 ./distributedlog-service/bin/dlog-daemon.sh start bookie --conf ${DL_HOME}/distributedlog-service/conf/bookie-1.conf
     SERVICE_PORT=3182 ./distributedlog-service/bin/dlog-daemon.sh start bookie --conf ${DL_HOME}/distributedlog-service/conf/bookie-2.conf
     SERVICE_PORT=3183 ./distributedlog-service/bin/dlog-daemon.sh start bookie --conf ${DL_HOME}/distributedlog-service/conf/bookie-3.conf
-    
+
 Verify whether the bookie is setup correctly. You could simply check whether the bookie is showed up in
 zookeeper `zkLedgersRootPath`/available znode.
 
 ::
-    
+
     $ ./distributedlog-service/bin/dlog zkshell localhost:2181
     Connecting to localhost:2181
     Welcome to ZooKeeper!
@@ -294,7 +296,7 @@ zookeeper `zkLedgersRootPath`/available znode.
 Or check if the bookie is exposing the stats at port `codahaleStatsHttpPort`.
 
 ::
-    
+
     // ping the service
     $ curl localhost:9001/ping
     pong
@@ -307,7 +309,7 @@ Stop bookie
 Stop the bookie using `dlog-daemon.sh`.
 
 ::
-    
+
     $ ./distributedlog-service/bin/dlog-daemon.sh stop bookie
     // Example:
     $ SERVICE_PORT=3181 ./distributedlog-service/bin/dlog-daemon.sh stop bookie
@@ -322,13 +324,13 @@ Turn bookie to readonly
 Start the bookie in `readonly` mode.
 
 ::
-    
+
     $ SERVICE_PORT=3181 ./distributedlog-service/bin/dlog-daemon.sh start bookie --conf ${DL_HOME}/distributedlog-service/conf/bookie-1.conf --readonly
 
 Verify if the bookie is running in `readonly` mode.
 
 ::
-    
+
     $ ./distributedlog-service/bin/dlog zkshell localhost:2181
     Connecting to localhost:2181
     Welcome to ZooKeeper!
@@ -376,7 +378,7 @@ Create namespace binding using `dlog tool`. For example, we create a namespace
 bookkeeper cluster we just created above.
 
 ::
-    
+
     $ distributedlog-service/bin/dlog admin bind \\
         -dlzr 127.0.0.1:2181 \\
         -dlzw 127.0.0.1:2181 \\
@@ -425,7 +427,7 @@ Run write proxy
 A write proxy could be started using `dlog-daemon.sh` script under `distributedlog-service`.
 
 ::
-    
+
     WP_SHARD_ID=${WP_SHARD_ID} WP_SERVICE_PORT=${WP_SERVICE_PORT} WP_STATS_PORT=${WP_STATS_PORT} ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
 
 - `WP_SHARD_ID`: A non-negative integer. You don't need to guarantee uniqueness of shard id, as it is just an
@@ -442,7 +444,7 @@ Please check `distributedlog-service/conf/dlogenv.sh` for more environment varia
 For example, we start 3 write proxies locally and point to the namespace created above.
 
 ::
-    
+
     $ WP_SHARD_ID=1 WP_SERVICE_PORT=4181 WP_STATS_PORT=20001 ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
     $ WP_SHARD_ID=2 WP_SERVICE_PORT=4182 WP_STATS_PORT=20002 ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
     $ WP_SHARD_ID=3 WP_SERVICE_PORT=4183 WP_STATS_PORT=20003 ./distributedlog-service/bin/dlog-daemon.sh start writeproxy
@@ -452,7 +454,7 @@ The write proxy will announce itself to the zookeeper path `.write_proxy` under
 We could verify that the write proxy is running correctly by checking the zookeeper path or checking its stats port.
 
 ::
-    
+
     $ ./distributedlog-service/bin/dlog zkshell localhost:2181
     Connecting to localhost:2181
     Welcome to ZooKeeper!
@@ -466,7 +468,7 @@ We could verify that the write proxy is running correctly by checking the zookee
 
 
 ::
-    
+
     $ curl localhost:20001/ping
     pong
 
@@ -477,7 +479,7 @@ Add and Remove Write Proxies
 Removing a write proxy is pretty straightforward by just killing the process.
 
 ::
-    
+
     WP_SHARD_ID=1 WP_SERVICE_PORT=4181 WP_STATS_PORT=10001 ./distributedlog-service/bin/dlog-daemon.sh stop writeproxy
 
 
@@ -506,14 +508,14 @@ Create 10 streams.
 Tail read from the 10 streams.
 
 ::
-    
+
     $ ./distributedlog-tutorials/distributedlog-basic/bin/runner run com.twitter.distributedlog.basic.MultiReader distributedlog://127.0.0.1:2181/messaging/distributedlog/mynamespace stream-0,stream-1,stream-2,stream-3,stream-4,stream-5,stream-6,stream-7,stream-8,stream-9,stream-10
 
 
 Run record generator over some streams
 
 ::
-    
+
     $ ./distributedlog-tutorials/distributedlog-basic/bin/runner run com.twitter.distributedlog.basic.RecordGenerator 'zk!127.0.0.1:2181!/messaging/distributedlog/mynamespace/.write_proxy' stream-0 100
     $ ./distributedlog-tutorials/distributedlog-basic/bin/runner run com.twitter.distributedlog.basic.RecordGenerator 'zk!127.0.0.1:2181!/messaging/distributedlog/mynamespace/.write_proxy' stream-1 100
 
@@ -521,7 +523,7 @@ Run record generator over some streams
 Check the terminal running `MultiReader`. You will see similar output as below:
 
 ::
-    
+
     """
     Received record DLSN{logSegmentSequenceNo=1, entryId=21044, slotId=0} from stream stream-0
     """
diff --git a/docs/deployment/docker.rst b/docs/deployment/docker.rst
index 8222dd6a0..d9fd87a9c 100644
--- a/docs/deployment/docker.rst
+++ b/docs/deployment/docker.rst
@@ -24,7 +24,7 @@ Steps
     ./scripts/snapshot
 
 
-2. Create your own docker image using 
+2. Create your own docker image using
 
 .. code-block:: bash
 

From 93e94857b74009622c633f3d44f6df26766df62e Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Thu, 15 Dec 2016 15:59:58 -0800
Subject: [PATCH 09/13] A few more fixes for benchmarks' scripts.

---
 distributedlog-benchmark/bin/bundle      |  6 ++++--
 distributedlog-benchmark/bin/dbench      | 14 ++++++++------
 distributedlog-benchmark/conf/dlogenv.sh |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/distributedlog-benchmark/bin/bundle b/distributedlog-benchmark/bin/bundle
index 1d01e9171..c0fdcd865 100755
--- a/distributedlog-benchmark/bin/bundle
+++ b/distributedlog-benchmark/bin/bundle
@@ -21,6 +21,8 @@
 set -e
 
 BASEDIR=$(dirname "$0")
-DLOG_ROOT="${BASEDIR}/.."
+DLOG_ROOT="${BASEDIR}/../.."
 
-bash "${DLOG_ROOT}"/scripts/bundle benchmark
+cd "${DLOG_ROOT}"
+
+bash scripts/bundle benchmark
diff --git a/distributedlog-benchmark/bin/dbench b/distributedlog-benchmark/bin/dbench
index 1f90ce3cf..ef5847743 100755
--- a/distributedlog-benchmark/bin/dbench
+++ b/distributedlog-benchmark/bin/dbench
@@ -21,7 +21,7 @@
 set -e
 
 BASEDIR=$(dirname "$0")
-DLOG_ROOT="${BASEDIR}/.."
+DLOG_ROOT="${BASEDIR}/../.."
 
 DLOG_HOME="${DLOG_ROOT}/distributedlog-benchmark"
 
@@ -44,8 +44,7 @@ These variable can also be set in conf/dlogenv.sh
 EOF
 }
 
-cd "${DLOG_ROOT}"
-source ./scripts/common.sh
+source ${DLOG_ROOT}/scripts/common.sh
 
 # get arguments
 COMMAND=$1
@@ -65,7 +64,7 @@ BENCH_ARGS="""
 """
 
 #Change to DLOG_HOME to support relative paths
-cd "$DLOG_HOME"
+#cd "$DLOG_HOME"
 
 case "${COMMAND}" in
   bkwrite)
@@ -74,7 +73,7 @@ case "${COMMAND}" in
     --rate ${INITIAL_RATE} \\
     --max-rate ${MAX_RATE} \\
     --change-rate ${CHANGE_RATE} \\
-    --change-interval ${CHANGE_RATE_INTERVAL}
+    --change-interval ${CHANGE_RATE_INTERVAL} \\
     """
     BENCH_ARGS="${BENCH_ARGS} \\ ${BENCH_WRITE_ARGS} \\ --mode dlwrite \\"
     exec java $OPTS $JMX_ARGS com.twitter.distributedlog.benchmark.Benchmarker $BENCH_ARGS $@
@@ -86,6 +85,7 @@ case "${COMMAND}" in
     --max-rate ${MAX_RATE} \\
     --change-rate ${CHANGE_RATE} \\
     --change-interval ${CHANGE_RATE_INTERVAL} \\
+    --finagle-name inet!localhost:8000 \\
     """
     BENCH_ARGS="${BENCH_ARGS} \\ ${BENCH_WRITE_ARGS} \\ --mode write \\"
     exec java $OPTS $JMX_ARGS com.twitter.distributedlog.benchmark.Benchmarker $BENCH_ARGS $@
@@ -95,6 +95,7 @@ case "${COMMAND}" in
     --readers-per-stream ${NUM_READERS_PER_STREAM} \\
     --max-stream-id ${MAX_STREAM_ID} \\
     --truncation-interval ${TRUNCATION_INTERVAL} \\
+    --finagle-name inet!localhost:8000 \\
     """
     BENCH_ARGS="${BENCH_ARGS} \\ ${BENCH_READ_ARGS} \\ --mode read \\"
     exec java $OPTS $JMX_ARGS com.twitter.distributedlog.benchmark.Benchmarker $BENCH_ARGS $@
@@ -103,7 +104,8 @@ case "${COMMAND}" in
     usage
     ;;
   *)
-    exec java $OPTS $COMMAND $@
+    set -x
+    echo java $OPTS $COMMAND $@
     ;;
 esac
 
diff --git a/distributedlog-benchmark/conf/dlogenv.sh b/distributedlog-benchmark/conf/dlogenv.sh
index 205606b7d..11abe9fe0 100644
--- a/distributedlog-benchmark/conf/dlogenv.sh
+++ b/distributedlog-benchmark/conf/dlogenv.sh
@@ -44,7 +44,7 @@ STREAM_NAME_PREFIX=distributedlog-smoketest
 # Benchmark Run Duration in minutes
 BENCHMARK_DURATION=60
 # DL Namespace
-DL_NAMESPACE=distributedlog://127.0.0.1:2181/messaging/distributedlog/mynamespace
+DL_NAMESPACE=distributedlog://127.0.0.1:2181/messaging/my_namespace
 # Benchmark SHARD id
 BENCHMARK_SHARD_ID=0
 

From 622d3ab664cad6f6ef652624aea92ec8eb8561c9 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Thu, 15 Dec 2016 16:01:29 -0800
Subject: [PATCH 10/13] Fix bundle for service.

---
 distributedlog-service/bin/bundle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/distributedlog-service/bin/bundle b/distributedlog-service/bin/bundle
index 7a5ce3e01..1b1904e94 100755
--- a/distributedlog-service/bin/bundle
+++ b/distributedlog-service/bin/bundle
@@ -21,6 +21,8 @@
 set -e
 
 BASEDIR=$(dirname "$0")
-DLOG_ROOT="${BASEDIR}/.."
+DLOG_ROOT="${BASEDIR}/../.."
 
-bash "${DLOG_ROOT}"/scripts/bundle service
+cd "${DLOG_ROOT}"
+
+bash scripts/bundle service

From c32dee21276190558a0cf1885e70c1e89f72c69c Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Thu, 15 Dec 2016 16:01:44 -0800
Subject: [PATCH 11/13] Remove useless cd

---
 scripts/bundle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/bundle b/scripts/bundle
index a0c8a3ae5..54691eca0 100755
--- a/scripts/bundle
+++ b/scripts/bundle
@@ -27,8 +27,6 @@ if [[ -z "${COMPONENT}" ]]; then
   exit 1
 fi
 
-cd "${DLOG_ROOT}"
-
 rm -rf "distributedlog-${COMPONENT}/lib"
 rm -rf "dist/distributedlog-${COMPONENT}*"
 

From f15cefd21edebfb950cbb09ad2f86c64f0b503aa Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Thu, 15 Dec 2016 16:02:19 -0800
Subject: [PATCH 12/13] fix a few more things in the common script.

---
 scripts/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 83d2021ff..f37ed1b51 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -60,7 +60,7 @@ if [ $? == 0 ]; then
 fi
 
 # exclude tests jar
-BUILT_JAR=$(ls "${DLOG_HOME}/target/distributedlog-*.jar" 2> /dev/null | egrep -v 'tests|javadoc|sources' | tail -1)
+BUILT_JAR=$(ls "${DLOG_HOME}"/target/distributedlog-*.jar 2> /dev/null | egrep -v 'tests|javadoc|sources' | tail -1)
 
 if [ -e "${BUILD_JAR}" ] && [ -e "${DLOG_JAR}" ]; then
   echo "\nCouldn't find dlog jar.";

From fe3965df40ab960e28f8cfa62151cbee68872384 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@apache.org>
Date: Thu, 15 Dec 2016 16:03:22 -0800
Subject: [PATCH 13/13] Fix dlog script for core.

---
 distributedlog-core/bin/dlog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/distributedlog-core/bin/dlog b/distributedlog-core/bin/dlog
index 0d67fdfd1..522e47c4e 100755
--- a/distributedlog-core/bin/dlog
+++ b/distributedlog-core/bin/dlog
@@ -21,8 +21,9 @@
 set -e
 
 BASEDIR=$(dirname "$0")
-DLOG_ROOT="${BASEDIR}/.."
-DLOG_HOME="${DLOG_ROOT}"
+DLOG_ROOT="${BASEDIR}/../.."
+
+DLOG_HOME="${DLOG_ROOT}/distributedlog-core"
 
 usage() {
   cat <<EOF
@@ -47,8 +48,7 @@ These variable can also be set in conf/dlogenv.sh
 EOF
 }
 
-cd "${DLOG_ROOT}"
-source ./scripts/common.sh
+source "${DLOG_ROOT}"/scripts/common.sh
 
 # get arguments
 COMMAND=$1