accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] git commit: ACCUMULO-1576 Applying patch by [~jmhsieh] to clean up scripts in the continuous ingest test suite
Date Mon, 23 Sep 2013 00:37:17 GMT
Updated Branches:
  refs/heads/master 5b2a58257 -> 6eaf906ff


ACCUMULO-1576 Applying patch by [~jmhsieh] to clean up scripts in the continuous
ingest test suite


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd94c237
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd94c237
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd94c237

Branch: refs/heads/master
Commit: dd94c237b70b2880dd701c878eda1d4642691224
Parents: cfc0e18
Author: Josh Elser <elserj@apache.org>
Authored: Sun Sep 22 19:47:00 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Sep 22 19:47:00 2013 -0400

----------------------------------------------------------------------
 test/system/continuous/README                    |  8 +++++---
 test/system/continuous/analyze-missing.sh        |  3 ++-
 test/system/continuous/continuous-env.sh.example | 12 +++++++-----
 test/system/continuous/mapred-setup.sh           |  3 ++-
 test/system/continuous/start-agitator.sh         |  4 ++--
 test/system/continuous/start-batchwalkers.sh     |  5 +++--
 test/system/continuous/start-ingest.sh           |  5 +++--
 test/system/continuous/start-scanners.sh         |  6 +++---
 test/system/continuous/start-stats.sh            | 14 +++++++-------
 test/system/continuous/start-walkers.sh          |  6 +++---
 test/system/continuous/stop-agitator.sh          |  4 ++--
 test/system/continuous/stop-batchwalkers.sh      |  6 +++---
 test/system/continuous/stop-ingest.sh            |  6 +++---
 test/system/continuous/stop-scanners.sh          |  6 +++---
 test/system/continuous/stop-stats.sh             |  4 ++--
 test/system/continuous/stop-walkers.sh           |  6 +++---
 16 files changed, 53 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/README
----------------------------------------------------------------------
diff --git a/test/system/continuous/README b/test/system/continuous/README
index e8f3450..2ee5bf0 100644
--- a/test/system/continuous/README
+++ b/test/system/continuous/README
@@ -2,9 +2,11 @@ This directory contains a suite of scripts for placing continuous query and
 ingest load on accumulo.  The purpose of these script is two fold. First,
 place continuous load on accumulo to see if breaks.  Second, collect
 statistics in order to understand how accumulo behaves .  To run these script
-copy all of the .example files and modify them.  These scripts rely on pssh.
-Before running any script you may need to use pssh to create the log directory on
-each machine if you want it local.  Also, create the table "ci" before running.
+copy all of the .example files and modify them.   You can put these scripts in 
+the current directory or define a CONTINUOUS_CONF_DIR where the files will be
+read from. These scripts rely on pssh. Before running any script you may need
+to use pssh to create the log directory on each machine if you want it local.
+Also, create the table "ci" before running.
 
 The following ingest scripts inserts data into accumulo that will form a random
 graph.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/analyze-missing.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/analyze-missing.sh b/test/system/continuous/analyze-missing.sh
index 05e597c..62ad15b 100755
--- a/test/system/continuous/analyze-missing.sh
+++ b/test/system/continuous/analyze-missing.sh
@@ -16,7 +16,8 @@
 # limitations under the License.
 
 
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 ./analyze-missing.pl $ACCUMULO_HOME $CONTINUOUS_LOG_DIR $USER $PASS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/continuous-env.sh.example
----------------------------------------------------------------------
diff --git a/test/system/continuous/continuous-env.sh.example b/test/system/continuous/continuous-env.sh.example
index 54ee0e3..76f2632 100644
--- a/test/system/continuous/continuous-env.sh.example
+++ b/test/system/continuous/continuous-env.sh.example
@@ -13,11 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#set this to an absolute path that exist on every machine
-HADOOP_HOME=/opt/hadoop
-ACCUMULO_HOME=/opt/accumulo
-JAVA_HOME=/opt/java
-ZOOKEEPER_HOME=/opt/zookeeper
+
+# set this to an absolute path that exist on every machine
+# Inherit values from environment if they are already set.
+HADOOP_HOME=${HADOOP_HOME:-/opt/hadoop}
+ACCUMULO_HOME=${ACCUMULO_HOME:-/opt/accumulo}
+JAVA_HOME=${JAVA_HOME:-/opt/java}
+ZOOKEEPER_HOME=${ZOOKEEPER_HOME:-/opt/zookeeper}
 
 CONTINUOUS_LOG_DIR=$ACCUMULO_HOME/test/system/continuous/logs
 INSTANCE_NAME=instance

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/mapred-setup.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/mapred-setup.sh b/test/system/continuous/mapred-setup.sh
index 3e5b227..e14d221 100755
--- a/test/system/continuous/mapred-setup.sh
+++ b/test/system/continuous/mapred-setup.sh
@@ -18,7 +18,8 @@
 # a little helper script that other scripts can source to setup 
 # for running a map reduce job
 
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 . $ACCUMULO_CONF_DIR/accumulo-env.sh
 
 SERVER_CMD='ls -1 $ACCUMULO_HOME/lib/accumulo-server-*[!javadoc\|sources].jar'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-agitator.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-agitator.sh b/test/system/continuous/start-agitator.sh
index 5ffd98f..52e5a4e 100755
--- a/test/system/continuous/start-agitator.sh
+++ b/test/system/continuous/start-agitator.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 nohup ./agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $MIN_KILL $MAX_KILL >$CONTINUOUS_LOG_DIR/`date
+%Y%m%d%H%M%S`_`hostname`_agitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_agitator.err
&
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-batchwalkers.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-batchwalkers.sh b/test/system/continuous/start-batchwalkers.sh
index 48dd4ec..c8dbb1f 100755
--- a/test/system/continuous/start-batchwalkers.sh
+++ b/test/system/continuous/start-batchwalkers.sh
@@ -16,7 +16,8 @@
 # limitations under the License.
 
 
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 DEBUG_OPT="";
 AUTH_OPT="";
@@ -30,5 +31,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousBatchWalker $DEBUG_OPT $AUTH_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $BATCH_WALKER_SLEEP $BATCH_WALKER_BATCH_SIZE $BATCH_WALKER_THREADS
>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.err &" < /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousBatchWalker $DEBUG_OPT $AUTH_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $BATCH_WALKER_SLEEP $BATCH_WALKER_BATCH_SIZE $BATCH_WALKER_THREADS
>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.err &" < /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-ingest.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-ingest.sh b/test/system/continuous/start-ingest.sh
index 38f62a7..19e0352 100755
--- a/test/system/continuous/start-ingest.sh
+++ b/test/system/continuous/start-ingest.sh
@@ -16,7 +16,8 @@
 # limitations under the License.
 
 
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 DEBUG_OPT="";
 VIS_OPT="";
@@ -34,5 +35,5 @@ if [ -n "$VISIBILITIES" ] ; then
 	VIS_OPT="--visibilities \"$VISIBILITIES\"";
 fi
 
-pssh -h ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousIngest
$DEBUG_OPT $VIS_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $NUM $MIN $MAX $MAX_CF
$MAX_CQ $MAX_MEM $MAX_LATENCY $NUM_THREADS $CHECKSUM >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.out
2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.err &" < /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousIngest $DEBUG_OPT $VIS_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $NUM $MIN $MAX $MAX_CF $MAX_CQ $MAX_MEM $MAX_LATENCY $NUM_THREADS
$CHECKSUM >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_ingest.err &" < /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-scanners.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-scanners.sh b/test/system/continuous/start-scanners.sh
index 5063c3d..16a5964 100755
--- a/test/system/continuous/start-scanners.sh
+++ b/test/system/continuous/start-scanners.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 DEBUG_OPT="";
 AUTH_OPT="";
@@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousScanner
$DEBUG_OPT $AUTH_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SCANNER_SLEEP_TIME
$SCANNER_ENTRIES >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_scanner.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_scanner.err &" < /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousScanner $DEBUG_OPT $AUTH_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SCANNER_SLEEP_TIME $SCANNER_ENTRIES >$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_scanner.out 2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_scanner.err
&" < /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-stats.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-stats.sh b/test/system/continuous/start-stats.sh
index 04b16a2..5ece7f5 100755
--- a/test/system/continuous/start-stats.sh
+++ b/test/system/continuous/start-stats.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 mkdir -p $CONTINUOUS_LOG_DIR
 
@@ -26,12 +26,12 @@ cat $ACCUMULO_CONF_DIR/accumulo-env.sh > $CONFIG_OUT
 echo >> $CONFIG_OUT
 echo -e "config -np\nconfig -t $TABLE -np\nquit" | $ACCUMULO_HOME/bin/accumulo shell -u $USER
-p $PASS >> $CONFIG_OUT
 echo >> $CONFIG_OUT
-cat continuous-env.sh >> $CONFIG_OUT
+cat $CONTINUOUS_CONF_DIR/continuous-env.sh >> $CONFIG_OUT
 echo >> $CONFIG_OUT
-echo "`wc -l walkers.txt`" >> $CONFIG_OUT
-echo "`wc -l ingesters.txt`" >> $CONFIG_OUT
-echo "`wc -l scanners.txt`" >> $CONFIG_OUT
-echo "`wc -l batch_walkers.txt`" >> $CONFIG_OUT
+echo "`wc -l $CONTINUOUS_CONF_DIR/walkers.txt`" >> $CONFIG_OUT
+echo "`wc -l $CONTINUOUS_CONF_DIR/ingesters.txt`" >> $CONFIG_OUT
+echo "`wc -l $CONTINUOUS_CONF_DIR/scanners.txt`" >> $CONFIG_OUT
+echo "`wc -l $CONTINUOUS_CONF_DIR/batch_walkers.txt`" >> $CONFIG_OUT
 
 
 nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousStatsCollector
$TABLE $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_stats.out
2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_stats.err &

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/start-walkers.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-walkers.sh b/test/system/continuous/start-walkers.sh
index 37d7c72..47d8cea 100755
--- a/test/system/continuous/start-walkers.sh
+++ b/test/system/continuous/start-walkers.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 DEBUG_OPT="";
 AUTH_OPT="";
@@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk
$DEBUG_OPT $AUTH_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SLEEP_TIME
>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_walk.err &" < /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousWalk $DEBUG_OPT $AUTH_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SLEEP_TIME >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.out
2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.err &" < /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-agitator.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-agitator.sh b/test/system/continuous/stop-agitator.sh
index 3cd0073..b853a55 100755
--- a/test/system/continuous/stop-agitator.sh
+++ b/test/system/continuous/stop-agitator.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 pkill -f agitator.pl
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-batchwalkers.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-batchwalkers.sh b/test/system/continuous/stop-batchwalkers.sh
index 5c05bcc..30a497d 100755
--- a/test/system/continuous/stop-batchwalkers.sh
+++ b/test/system/continuous/stop-batchwalkers.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
-. continuous-env.sh
-
-pssh -h batch_walkers.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousBatchWalker"
< /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousBatchWalker"
< /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-ingest.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-ingest.sh b/test/system/continuous/stop-ingest.sh
index c7ff670..17267ef 100755
--- a/test/system/continuous/stop-ingest.sh
+++ b/test/system/continuous/stop-ingest.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
-. continuous-env.sh
-
-pssh -h ingesters.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousIngest"
< /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousIngest"
< /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-scanners.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-scanners.sh b/test/system/continuous/stop-scanners.sh
index 5dfe66f..5c24c11 100755
--- a/test/system/continuous/stop-scanners.sh
+++ b/test/system/continuous/stop-scanners.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
-. continuous-env.sh
-
-pssh -h scanners.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousScanner"
< /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousScanner"
< /dev/null
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-stats.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-stats.sh b/test/system/continuous/stop-stats.sh
index 993394d..50c6058 100755
--- a/test/system/continuous/stop-stats.sh
+++ b/test/system/continuous/stop-stats.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-. continuous-env.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
 pkill -f org.apache.accumulo.server.test.continuous.ContinuousStatsCollector
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd94c237/test/system/continuous/stop-walkers.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/stop-walkers.sh b/test/system/continuous/stop-walkers.sh
index 020a1df..dae7254 100755
--- a/test/system/continuous/stop-walkers.sh
+++ b/test/system/continuous/stop-walkers.sh
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
 
-. continuous-env.sh
-
-pssh -h walkers.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousWalk"
< /dev/null
+pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f [o]rg.apache.accumulo.server.test.continuous.ContinuousWalk"
< /dev/null
 


Mime
View raw message