Repository: accumulo Updated Branches: refs/heads/master eb0cf2f4b -> d40c887b4
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-scanners.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-scanners.sh b/test/system/continuous/stop-scanners.sh index 8b1852b..cf927b0 100755 --- a/test/system/continuous/stop-scanners.sh +++ b/test/system/continuous/stop-scanners.sh @@ -17,17 +17,17 @@ # Start: Resolve Script Directory SOURCE="${BASH_SOURCE[0]}" -while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" +while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a symlink + bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} -. $CONTINUOUS_CONF_DIR/continuous-env.sh +. "$CONTINUOUS_CONF_DIR/continuous-env.sh" -pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousScanner'" < /dev/null +pssh -h "$CONTINUOUS_CONF_DIR/scanners.txt" "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousScanner'" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-stats.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-stats.sh b/test/system/continuous/stop-stats.sh index a806f2d..9886eec 100755 --- a/test/system/continuous/stop-stats.sh +++ b/test/system/continuous/stop-stats.sh @@ -17,17 +17,17 @@ # Start: Resolve Script Directory SOURCE="${BASH_SOURCE[0]}" -while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" +while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a symlink + bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} -. $CONTINUOUS_CONF_DIR/continuous-env.sh +. "$CONTINUOUS_CONF_DIR/continuous-env.sh" pkill -f org.apache.accumulo.test.continuous.ContinuousStatsCollector http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-walkers.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-walkers.sh b/test/system/continuous/stop-walkers.sh index 7e75969..2c22cfa 100755 --- a/test/system/continuous/stop-walkers.sh +++ b/test/system/continuous/stop-walkers.sh @@ -17,17 +17,17 @@ # Start: Resolve Script Directory SOURCE="${BASH_SOURCE[0]}" -while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" +while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a symlink + bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} -. $CONTINUOUS_CONF_DIR/continuous-env.sh +. "$CONTINUOUS_CONF_DIR/continuous-env.sh" -pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousWalk'" < /dev/null +pssh -h "$CONTINUOUS_CONF_DIR/walkers.txt" "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousWalk'" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/apocalypse.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/apocalypse.sh b/test/system/randomwalk/bin/apocalypse.sh index 899256c..2855a7f 100755 --- a/test/system/randomwalk/bin/apocalypse.sh +++ b/test/system/randomwalk/bin/apocalypse.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -17,33 +17,33 @@ #copied below from hadoop-config.sh this="$0" -while [ -h "$this" ]; do - ls=`ls -ld "$this"` - link=`expr "$ls" : '.*-> \(.*\)$'` +while [[ -h "$this" ]]; do + ls=$(ls -ld "$this") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '.*/.*' > /dev/null; then this="$link" else - this=`dirname "$this"`/"$link" + this=$(dirname "$this")/"$link" fi done -bin=`dirname "$this"` -script=`basename "$this"` -bin=`cd "$bin"; pwd` +bin=$(dirname "$this") +script=$(basename "$this") +bin=$(cd "$bin"; pwd) this="$bin/$script" -ACCUMULO_HOME=`dirname "$this"`/../../../.. -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd` +ACCUMULO_HOME=$(dirname "$this")/../../../.. +export ACCUMULO_HOME=$(cd "$ACCUMULO_HOME"; pwd) -if [ -f $ACCUMULO_HOME/conf/accumulo-env.sh ] ; then -. $ACCUMULO_HOME/conf/accumulo-env.sh +if [[ -f $ACCUMULO_HOME/conf/accumulo-env.sh ]] ; then + . "$ACCUMULO_HOME/conf/accumulo-env.sh" fi -if [ -z $HADOOP_PREFIX ] ; then +if [[ -z $HADOOP_PREFIX ]] ; then echo "HADOOP_PREFIX is not set. Please make sure it's set globally." exit 1 fi echo 'killing all accumulo processes' -pssh -h $ACCUMULO_HOME/conf/slaves "pkill -9 -f app=[tmg].*org.apache.accumulo.start " < /dev/null -pssh -h $ACCUMULO_HOME/conf/masters "pkill -9 -f app=[tmg].*org.apache.accumulo.start " < /dev/null +pssh -h "$ACCUMULO_HOME/conf/slaves" "pkill -9 -f app=[tmg].*org.apache.accumulo.start " < /dev/null +pssh -h "$ACCUMULO_HOME/conf/masters" "pkill -9 -f app=[tmg].*org.apache.accumulo.start " < /dev/null exit 0 http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/copy-config.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/copy-config.sh b/test/system/randomwalk/bin/copy-config.sh index 01a90e0..48afc19 100755 --- a/test/system/randomwalk/bin/copy-config.sh +++ b/test/system/randomwalk/bin/copy-config.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,23 +16,23 @@ # limitations under the License. -if [ -z $HADOOP_PREFIX ] ; then +if [[ -z $HADOOP_PREFIX ]] ; then echo "HADOOP_PREFIX is not set. Please make sure it's set globally." exit 1 fi -if [ -z $ACCUMULO_HOME ] ; then +if [[ -z $ACCUMULO_HOME ]] ; then echo "ACCUMULO_HOME is not set. Please make sure it's set globally." exit 1 fi RW_HOME=$ACCUMULO_HOME/test/system/randomwalk -cd $RW_HOME +cd "$RW_HOME" tar czf config.tgz conf -$HADOOP_PREFIX/bin/hadoop fs -rmr /randomwalk 2>/dev/null -$HADOOP_PREFIX/bin/hadoop fs -mkdir /randomwalk -$HADOOP_PREFIX/bin/hadoop fs -put config.tgz /randomwalk -$HADOOP_PREFIX/bin/hadoop fs -setrep 3 /randomwalk/config.tgz +"$HADOOP_PREFIX/bin/hadoop" fs -rmr /randomwalk 2>/dev/null +"$HADOOP_PREFIX/bin/hadoop" fs -mkdir /randomwalk +"$HADOOP_PREFIX/bin/hadoop" fs -put config.tgz /randomwalk +"$HADOOP_PREFIX/bin/hadoop" fs -setrep 3 /randomwalk/config.tgz rm config.tgz http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/kill-all.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/kill-all.sh b/test/system/randomwalk/bin/kill-all.sh index 75e73af..e4bc0be 100755 --- a/test/system/randomwalk/bin/kill-all.sh +++ b/test/system/randomwalk/bin/kill-all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -17,24 +17,24 @@ #copied below from hadoop-config.sh this="$0" -while [ -h "$this" ]; do - ls=`ls -ld "$this"` - link=`expr "$ls" : '.*-> \(.*\)$'` +while [[ -h "$this" ]]; do + ls=$(ls -ld "$this") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '.*/.*' > /dev/null; then this="$link" else - this=`dirname "$this"`/"$link" + this=$(dirname "$this")/"$link" fi done -bin=`dirname "$this"` -script=`basename "$this"` -bin=`cd "$bin"; pwd` +bin=$(dirname "$this") +script=$(basename "$this") +bin=$(cd "$bin"; pwd) this="$bin/$script" -ACCUMULO_HOME=`dirname "$this"`/../../../.. -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd` +ACCUMULO_HOME=$(dirname "$this")/../../../.. +export ACCUMULO_HOME=$(cd "$ACCUMULO_HOME"; pwd) RW_HOME=$ACCUMULO_HOME/test/system/randomwalk echo 'killing random walkers' -pssh -h $RW_HOME/conf/walkers "pkill -f [r]andomwalk.Framework" < /dev/null +pssh -h "$RW_HOME/conf/walkers" "pkill -f [r]andomwalk.Framework" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/kill-local.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/kill-local.sh b/test/system/randomwalk/bin/kill-local.sh index 1d5af9b..2b35437 100755 --- a/test/system/randomwalk/bin/kill-local.sh +++ b/test/system/randomwalk/bin/kill-local.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/reset-cluster.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/reset-cluster.sh b/test/system/randomwalk/bin/reset-cluster.sh index d394222..ab87eb2 100755 --- a/test/system/randomwalk/bin/reset-cluster.sh +++ b/test/system/randomwalk/bin/reset-cluster.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -17,67 +17,67 @@ #copied below from hadoop-config.sh this="$0" -while [ -h "$this" ]; do - ls=`ls -ld "$this"` - link=`expr "$ls" : '.*-> \(.*\)$'` +while [[ -h "$this" ]]; do + ls=$(ls -ld "$this") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '.*/.*' > /dev/null; then this="$link" else - this=`dirname "$this"`/"$link" + this=$(dirname "$this")/"$link" fi done -bin=`dirname "$this"` -script=`basename "$this"` -bin=`cd "$bin"; pwd` +bin=$(dirname "$this") +script=$(basename "$this") +bin=$(cd "$bin"; pwd) this="$bin/$script" -ACCUMULO_HOME=`dirname "$this"`/../../../.. -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd` +ACCUMULO_HOME=$(dirname "$this")/../../../.. +export ACCUMULO_HOME=$(cd "$ACCUMULO_HOME"; pwd) -if [ -z "$ACCUMULO_CONF_DIR" ] ; then - $ACCUMULO_CONF_DIR=${ACCUMULO_HOME}/conf +if [[ -z "$ACCUMULO_CONF_DIR" ]] ; then + ACCUMULO_CONF_DIR=${ACCUMULO_HOME}/conf fi -if [ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ] ; then -. $ACCUMULO_CONF_DIR/accumulo-env.sh +if [[ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ]] ; then + . "$ACCUMULO_CONF_DIR/accumulo-env.sh" fi -if [ -z $HADOOP_PREFIX ] ; then +if [[ -z $HADOOP_PREFIX ]] ; then echo "HADOOP_PREFIX is not set. Please make sure it's set globally." exit 1 fi -if [ "$1" = "" ] ; then +if [[ -z $1 ]] ; then echo "Usage: update-cluster.sh <TARFILE>" exit 1 fi echo 'killing accumulo' -pssh -h $ACCUMULO_CONF_DIR/slaves "pkill -f org.apache.accumulo.start" < /dev/null +pssh -h "$ACCUMULO_CONF_DIR/slaves" "pkill -f org.apache.accumulo.start" < /dev/null pkill -f org.apache.accumulo.start pkill -f agitator.pl echo 'updating accumulo' -cd $ACCUMULO_HOME/.. -tar xzf $1 +cd "$ACCUMULO_HOME/.." +tar xzf "$1" echo 'cleaning logs directory' -rm -f $ACCUMULO_HOME/logs/* -rm -f $ACCUMULO_HOME/test/system/randomwalk/logs/* -rm -f $ACCUMULO_HOME/test/system/continuous/logs/* +rm -f "$ACCUMULO_HOME/logs/*" +rm -f "$ACCUMULO_HOME/test/system/randomwalk/logs/*" +rm -f "$ACCUMULO_HOME/test/system/continuous/logs/*" rm -f ~/rwlogs/* echo 'removing old code' -pssh -h $ACCUMULO_CONF_DIR/slaves "rm -rf $ACCUMULO_HOME" < /dev/null +pssh -h "$ACCUMULO_CONF_DIR/slaves" "rm -rf $ACCUMULO_HOME" < /dev/null echo 'pushing new code' -prsync -r -h $ACCUMULO_CONF_DIR/slaves $ACCUMULO_HOME /opt/dev +prsync -r -h "$ACCUMULO_CONF_DIR/slaves" "$ACCUMULO_HOME" /opt/dev echo 'removing /accumulo dir' -$HADOOP_PREFIX/bin/hadoop fs -rmr /accumulo +"$HADOOP_PREFIX/bin/hadoop" fs -rmr /accumulo echo 'creating new instance' -printf "test\nY\nsecret\nsecret\n" | $ACCUMULO_HOME/bin/accumulo init +printf "test\nY\nsecret\nsecret\n" | "$ACCUMULO_HOME/bin/accumulo" init echo 'starting accumulo' -$ACCUMULO_HOME/bin/start-all.sh +"$ACCUMULO_HOME/bin/start-all.sh" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/start-all.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/start-all.sh b/test/system/randomwalk/bin/start-all.sh index 48219c6..4734861 100755 --- a/test/system/randomwalk/bin/start-all.sh +++ b/test/system/randomwalk/bin/start-all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -17,38 +17,38 @@ #copied below from hadoop-config.sh this="$0" -while [ -h "$this" ]; do - ls=`ls -ld "$this"` - link=`expr "$ls" : '.*-> \(.*\)$'` +while [[ -h "$this" ]]; do + ls=$(ls -ld "$this") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '.*/.*' > /dev/null; then this="$link" else - this=`dirname "$this"`/"$link" + this=$(dirname "$this")/"$link" fi done -bin=`dirname "$this"` -script=`basename "$this"` -bin=`cd "$bin"; pwd` +bin=$(dirname "$this") +script=$(basename "$this") +bin=$(cd "$bin"; pwd) this="$bin/$script" -ACCUMULO_HOME=`dirname "$this"`/../../../.. -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd` +ACCUMULO_HOME=$(dirname "$this")/../../../.. +export ACCUMULO_HOME=$(cd "$ACCUMULO_HOME"; pwd) -if [ -z "${ACCUMULO_CONF_DIR}" ]; then +if [[ -z "${ACCUMULO_CONF_DIR}" ]]; then export ACCUMULO_CONF_DIR=${ACCUMULO_HOME}/conf fi -if [ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ] ; then -. $ACCUMULO_CONF_DIR/accumulo-env.sh +if [[ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ]] ; then + . "$ACCUMULO_CONF_DIR/accumulo-env.sh" fi -if [ -z "$HADOOP_PREFIX" ] ; then +if [[ -z $HADOOP_PREFIX ]] ; then echo "HADOOP_PREFIX is not set. Please make sure it's set globally." exit 1 fi -if [ "$1" = "" ] ; then +if [[ -z $1 ]] ; then echo "Usage: start-walkers.sh <startNode>" exit 1 fi http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/start-local.sh ---------------------------------------------------------------------- diff --git a/test/system/randomwalk/bin/start-local.sh b/test/system/randomwalk/bin/start-local.sh index 524a80b..0f8042c 100755 --- a/test/system/randomwalk/bin/start-local.sh +++ b/test/system/randomwalk/bin/start-local.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,42 +18,42 @@ #copied below from hadoop-config.sh this="$0" -while [ -h "$this" ]; do - ls=`ls -ld "$this"` - link=`expr "$ls" : '.*-> \(.*\)$'` +while [[ -h "$this" ]]; do + ls=$(ls -ld "$this") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '.*/.*' > /dev/null; then this="$link" else - this=`dirname "$this"`/"$link" + this=$(dirname "$this")/"$link" fi done -bin=`dirname "$this"` -script=`basename "$this"` -bin=`cd "$bin"; pwd` +bin=$(dirname "$this") +script=$(basename "$this") +bin=$(cd "$bin"; pwd) this="$bin/$script" -ACCUMULO_HOME=`dirname "$this"`/../../../.. -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd` +ACCUMULO_HOME=$(dirname "$this")/../../../.. +export ACCUMULO_HOME=$(cd "$ACCUMULO_HOME"; pwd) -if [ -z "$ACCUMULO_CONF_DIR" ] ; then +if [[ -z "$ACCUMULO_CONF_DIR" ]] ; then export ACCUMULO_CONF_DIR=${ACCUMULO_HOME}/conf fi -if [ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ] ; then -. $ACCUMULO_CONF_DIR/accumulo-env.sh +if [[ -f $ACCUMULO_CONF_DIR/accumulo-env.sh ]] ; then + . "$ACCUMULO_CONF_DIR/accumulo-env.sh" fi -if [ -z "$HADOOP_PREFIX" ] ; then +if [[ -z $HADOOP_PREFIX ]] ; then echo "HADOOP_PREFIX is not set. Please make sure it's set globally." exit 1 fi -if [ "$1" = "" ] ; then +if [[ -z $1 ]] ; then echo "Usage: start-local.sh <startNode>" exit 1 fi -RW_HOME="$ACCUMULO_HOME/test/system/randomwalk" +RW_HOME=$ACCUMULO_HOME/test/system/randomwalk cd "$RW_HOME" @@ -61,7 +61,7 @@ cd "$RW_HOME" "$HADOOP_PREFIX/bin/hadoop" fs -get /randomwalk/config.tgz config.tgz # extract config to a tmp directory -TEMP="`hostname`-tmp" +TEMP="$(hostname)-tmp" rm -rf "$TEMP" mkdir "$TEMP" tar xzf config.tgz -C "$TEMP" @@ -69,11 +69,11 @@ rm config.tgz # config the logging RW_LOGS="$RW_HOME/logs" -if [ ! -d "$RW_LOGS" ] +if [[ ! -d "$RW_LOGS" ]] then mkdir -p "$RW_LOGS" || ( echo "cannot create $RW_LOGS" ; exit 1 ) fi -LOG_ID=`hostname -s`_`date +%Y%m%d_%H%M%S` +LOG_ID=$(hostname -s)_$(date +%Y%m%d_%H%M%S) # run the local walker "$ACCUMULO_HOME/bin/accumulo" org.apache.accumulo.test.randomwalk.Framework --configDir "$RW_HOME/$TEMP/conf/" --logDir "$RW_LOGS" --logId "$LOG_ID" --module "$1" >"$RW_LOGS/$LOG_ID.out" 2>"$RW_LOGS/$LOG_ID.err" & http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/reader.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/reader.sh b/test/system/stress/reader.sh index 1138685..e282632 100755 --- a/test/system/stress/reader.sh +++ b/test/system/stress/reader.sh @@ -19,20 +19,21 @@ # Ref: http://stackoverflow.com/questions/59895/ SOURCE="${BASH_SOURCE[0]}" while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" + DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${DIR}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) # Stop: Resolve Script Directory LOG_DIR=${DIR}/logs -mkdir -p $LOG_DIR +mkdir -p "$LOG_DIR" # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" ts=$(date +%Y%m%d%H%M%S) host=$(hostname) -${ACCUMULO_HOME}/bin/accumulo org.apache.accumulo.test.stress.random.Scan $INSTANCE $USERPASS $SCAN_SEED $CONTINUOUS_SCAN $SCAN_BATCH_SIZE \ - > $LOG_DIR/${ts}_${host}_reader.out \ - 2> $LOG_DIR/${ts}_${host}_reader.err +# We want USERPASS to word split +"${ACCUMULO_HOME}/bin/accumulo org.apache.accumulo.test.stress.random.Scan" "$INSTANCE" $USERPASS "$SCAN_SEED" "$CONTINUOUS_SCAN" "$SCAN_BATCH_SIZE" \ + > "$LOG_DIR/${ts}_${host}_reader.out" \ + 2> "$LOG_DIR/${ts}_${host}_reader.err" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/start-readers.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/start-readers.sh b/test/system/stress/start-readers.sh index 709c46e..6f651f4 100755 --- a/test/system/stress/start-readers.sh +++ b/test/system/stress/start-readers.sh @@ -27,7 +27,7 @@ DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" # Stop: Resolve Script Directory # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" if [[ ! -f ${DIR}/readers ]]; then echo readers file is missing @@ -35,6 +35,6 @@ if [[ ! -f ${DIR}/readers ]]; then fi # Copy environment out -pscp -h ${DIR}/readers ${DIR}/stress-env.sh ${DIR} +pscp -h "${DIR}/readers" "${DIR}/stress-env.sh" "${DIR}" -pssh -h ${DIR}/readers "nohup ${DIR}/reader.sh >${DIR}/reader.out 2>${DIR}/reader.err < /dev/null &" +pssh -h "${DIR}/readers" "nohup ${DIR}/reader.sh >${DIR}/reader.out 2>${DIR}/reader.err < /dev/null &" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/start-writers.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/start-writers.sh b/test/system/stress/start-writers.sh index b9464cc..474117c 100755 --- a/test/system/stress/start-writers.sh +++ b/test/system/stress/start-writers.sh @@ -19,15 +19,15 @@ # Ref: http://stackoverflow.com/questions/59895/ SOURCE="${BASH_SOURCE[0]}" while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" + DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${DIR}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) # Stop: Resolve Script Directory # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" if [[ ! -f ${DIR}/writers ]]; then echo writers file is missing @@ -35,6 +35,6 @@ if [[ ! -f ${DIR}/writers ]]; then fi # Copy environment out -pscp -h ${DIR}/writers ${DIR}/stress-env.sh ${DIR} +pscp -h "${DIR}/writers" "${DIR}/stress-env.sh" "${DIR}" -pssh -h ${DIR}/writers "nohup ${DIR}/writer.sh >${DIR}/writer.out 2>${DIR}/writer.err < /dev/null &" +pssh -h "${DIR}/writers" "nohup ${DIR}/writer.sh >${DIR}/writer.out 2>${DIR}/writer.err < /dev/null &" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/stop-readers.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/stop-readers.sh b/test/system/stress/stop-readers.sh index 1c59971..8bd4a6f 100755 --- a/test/system/stress/stop-readers.sh +++ b/test/system/stress/stop-readers.sh @@ -19,18 +19,18 @@ # Ref: http://stackoverflow.com/questions/59895/ SOURCE="${BASH_SOURCE[0]}" while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" + DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${DIR}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) # Stop: Resolve Script Directory # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" -if [[ ! -f ${DIR}/readers ]]; then +if [[ ! -f "${DIR}/readers" ]]; then echo readers file is missing exit 1 fi -pssh -h ${DIR}/readers "pkill -f '[o]rg.apache.accumulo.test.stress.random.Scan'" < /dev/null +pssh -h "${DIR}/readers" "pkill -f '[o]rg.apache.accumulo.test.stress.random.Scan'" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/stop-writers.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/stop-writers.sh b/test/system/stress/stop-writers.sh index d925cb3..5c9e8d7 100755 --- a/test/system/stress/stop-writers.sh +++ b/test/system/stress/stop-writers.sh @@ -19,18 +19,18 @@ # Ref: http://stackoverflow.com/questions/59895/ SOURCE="${BASH_SOURCE[0]}" while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" + DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${DIR}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) # Stop: Resolve Script Directory # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" -if [[ ! -f ${DIR}/writers ]]; then +if [[ ! -f "${DIR}/writers" ]]; then echo writers file is missing exit 1 fi -pssh -h ${DIR}/writers "pkill -f '[o]rg.apache.accumulo.test.stress.random.Write'" < /dev/null +pssh -h "${DIR}/writers" "pkill -f '[o]rg.apache.accumulo.test.stress.random.Write'" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/stress/writer.sh ---------------------------------------------------------------------- diff --git a/test/system/stress/writer.sh b/test/system/stress/writer.sh index ef26fed..7107242 100755 --- a/test/system/stress/writer.sh +++ b/test/system/stress/writer.sh @@ -19,24 +19,26 @@ # Ref: http://stackoverflow.com/questions/59895/ SOURCE="${BASH_SOURCE[0]}" while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" - SOURCE="$(readlink "${SOURCE}")" + DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) + SOURCE=$(readlink "${SOURCE}") [[ "${SOURCE}" != /* ]] && SOURCE="${DIR}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +DIR=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) # Stop: Resolve Script Directory LOG_DIR=${DIR}/logs -mkdir -p $LOG_DIR +mkdir -p "$LOG_DIR" # Source environment -. ${DIR}/stress-env.sh +. "${DIR}/stress-env.sh" ts=$(date +%Y%m%d%H%M%S) host=$(hostname) # TBD - --clear-table option -${ACCUMULO_HOME}/bin/accumulo org.apache.accumulo.test.stress.random.Write $INSTANCE $USERPASS $ROW_RANGE $CF_RANGE $CQ_RANGE $VALUE_RANGE \ - $ROW_SEED $CF_SEED $CQ_SEED $VALUE_SEED $ROW_WIDTH $ROW_WIDTH_SEED $MAX_CELLS_PER_MUTATION $WRITE_DELAY \ - > $LOG_DIR/${ts}_${host}_writer.out \ - 2> $LOG_DIR/${ts}_${host}_writer.err +# We want $USERPASS to word split +"${ACCUMULO_HOME}/bin/accumulo org.apache.accumulo.test.stress.random.Write" "$INSTANCE" $USERPASS "$ROW_RANGE" "$CF_RANGE" "$CQ_RANGE" "$VALUE_RANGE" \ + "$ROW_SEED" "$CF_SEED" "$CQ_SEED" "$VALUE_SEED" \ + "$ROW_WIDTH" "$ROW_WIDTH_SEED" "$MAX_CELLS_PER_MUTATION" "$WRITE_DELAY" \ + > "$LOG_DIR/${ts}_${host}_writer.out" \ + 2> "$LOG_DIR/${ts}_${host}_writer.err" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/upgrade_test.sh ---------------------------------------------------------------------- diff --git a/test/system/upgrade_test.sh b/test/system/upgrade_test.sh index 6259e1c..590c07c 100755 --- a/test/system/upgrade_test.sh +++ b/test/system/upgrade_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,9 +16,9 @@ # limitations under the License. -if [ $# -ne 1 ] -then - echo "Usage: `basename $0` clean|dirty" +if [[ $# != 1 ]] ; then + BASENAME=$(basename "$0") + echo "Usage: $BASENAME clean|dirty" exit -1 fi @@ -34,43 +34,43 @@ DIR=/accumulo BULK=/tmp/upt pkill -f accumulo.start -hadoop fs -rmr $DIR -hadoop fs -rmr $BULK -hadoop fs -mkdir $BULK/fail +hadoop fs -rmr "$DIR" +hadoop fs -rmr "$BULK" +hadoop fs -mkdir "$BULK/fail" -$PREV/bin/accumulo init --clear-instance-name --instance-name testUp --password secret -$PREV/bin/start-all.sh +"$PREV/bin/accumulo" init --clear-instance-name --instance-name testUp --password secret +"$PREV/bin/start-all.sh" -$PREV/bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1 --size 50 --random 56 --rows 200000 --start 0 --cols 1 --createTable --splits 10 -$PREV/bin/accumulo org.apache.accumulo.test.TestIngest --rfile $BULK/bulk/test --timestamp 1 --size 50 --random 56 --rows 200000 --start 200000 --cols 1 +"$PREV/bin/accumulo" org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1 --size 50 --random 56 --rows 200000 --start 0 --cols 1 --createTable --splits 10 +"$PREV/bin/accumulo" org.apache.accumulo.test.TestIngest --rfile $BULK/bulk/test --timestamp 1 --size 50 --random 56 --rows 200000 --start 200000 --cols 1 echo -e "table test_ingest\nimportdirectory $BULK/bulk $BULK/fail false" | $PREV/bin/accumulo shell -u root -p secret -if [ $1 == "dirty" ]; then +if [[ $1 == dirty ]]; then pkill -9 -f accumulo.start else - $PREV/bin/stop-all.sh + "$PREV/bin/stop-all.sh" fi echo "==== Starting Current ===" -$CURR/bin/start-all.sh -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 400000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/start-all.sh" +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 400000 --start 0 --cols 1 -u root -p secret echo "compact -t test_ingest -w" | $CURR/bin/accumulo shell -u root -p secret -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 400000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 400000 --start 0 --cols 1 -u root -p secret -$CURR/bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret echo "compact -t test_ingest -w" | $CURR/bin/accumulo shell -u root -p secret -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret -$CURR/bin/stop-all.sh -$CURR/bin/start-all.sh +"$CURR/bin/stop-all.sh" +"$CURR/bin/start-all.sh" -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret pkill -9 -f accumulo.start -$CURR/bin/start-all.sh +"$CURR/bin/start-all.sh" -$CURR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret +"$CURR/bin/accumulo" org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 -u root -p secret
