Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CCA60C707 for ; Mon, 23 Sep 2013 00:24:07 +0000 (UTC) Received: (qmail 6065 invoked by uid 500); 23 Sep 2013 00:24:07 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 6007 invoked by uid 500); 23 Sep 2013 00:24:07 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 5947 invoked by uid 99); 23 Sep 2013 00:24:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Sep 2013 00:24:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 757CA8B09C7; Mon, 23 Sep 2013 00:24:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 23 Sep 2013 00:24:08 -0000 Message-Id: <1a0ff82cce2848dd92b5575b42914d51@git.apache.org> In-Reply-To: <1eb2d3a19c3f4fabac66ae26a8733ec6@git.apache.org> References: <1eb2d3a19c3f4fabac66ae26a8733ec6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7db1a446 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7db1a446 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7db1a446 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 7db1a446a6be2d52467ef9102ff975f7bc50b912 Parents: 51dcfd8 dd94c23 Author: Josh Elser Authored: Sun Sep 22 19:58:39 2013 -0400 Committer: Josh Elser Committed: Sun Sep 22 19:58:39 2013 -0400 ---------------------------------------------------------------------- test/system/continuous/README | 12 +++++++----- test/system/continuous/analyze-missing.sh | 3 ++- test/system/continuous/continuous-env.sh.example | 11 ++++++----- 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, 54 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/README ---------------------------------------------------------------------- diff --cc test/system/continuous/README index ea84cb8,2ee5bf0..40dbb5f --- a/test/system/continuous/README +++ b/test/system/continuous/README @@@ -2,11 -2,11 +2,13 @@@ This directory contains a suite of scri 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. - You can run org.apache.accumulo.test.continuous.GenSplits to generate - splits points for a continuous ingest table. + 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. ++Also, create the table "ci" before running. You can run ++org.apache.accumulo.test.continuous.GenSplits to generate splits points for a ++continuous ingest table. The following ingest scripts inserts data into accumulo that will form a random graph. http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/continuous-env.sh.example ---------------------------------------------------------------------- diff --cc test/system/continuous/continuous-env.sh.example index 570c502,76f2632..453c299 --- a/test/system/continuous/continuous-env.sh.example +++ b/test/system/continuous/continuous-env.sh.example @@@ -13,11 -13,13 +13,12 @@@ # 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_PREFIX=/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/7db1a446/test/system/continuous/mapred-setup.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/mapred-setup.sh index c348131,e14d221..e6bd2ca --- a/test/system/continuous/mapred-setup.sh +++ b/test/system/continuous/mapred-setup.sh @@@ -18,7 -18,15 +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' - -if [ `eval $SERVER_CMD | wc -l` != "1" ] ; then - echo "Not exactly one accumulo-server jar in $ACCUMULO_HOME/lib" - exit 1 -fi - -SERVER_LIBJAR=`eval $SERVER_CMD` +SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar" http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/start-agitator.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-agitator.sh index 16a1d42,52e5a4e..980cd77 --- a/test/system/continuous/start-agitator.sh +++ b/test/system/continuous/start-agitator.sh @@@ -15,11 -15,8 +15,11 @@@ # 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 +export HADOOP_PREFIX + +mkdir -p $CONTINUOUS_LOG_DIR 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/7db1a446/test/system/continuous/start-batchwalkers.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-batchwalkers.sh index 0d2f662,c8dbb1f..1c560f7 --- a/test/system/continuous/start-batchwalkers.sh +++ b/test/system/continuous/start-batchwalkers.sh @@@ -30,5 -31,5 +31,5 @@@ if [ -n "$AUTHS" ] ; the fi - pssh -h batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousBatchWalker $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $BATCH_WALKER_SLEEP --numToScan $BATCH_WALKER_BATCH_SIZE --scanThreads $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 ++pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousBatchWalker $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $BATCH_WALKER_SLEEP --numToScan $BATCH_WALKER_BATCH_SIZE --scanThreads $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/7db1a446/test/system/continuous/start-ingest.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-ingest.sh index d3753eb,19e0352..a0d2149 --- a/test/system/continuous/start-ingest.sh +++ b/test/system/continuous/start-ingest.sh @@@ -28,10 -29,11 +29,10 @@@ f if [ -n "$VISIBILITIES" ] ; then VIS_OPT="--visibilities \"$VISIBILITIES\""; fi +CHECKSUM_OPT=--addCheckSum +if [ "$CHECKSUM" == "false" ] ; then + CHECSUM_OPT= +fi - pssh -h ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousIngest $DEBUG_OPT $VIS_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --num $NUM --min $MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS $CHECKSUM_OPT >$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 ++pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousIngest $DEBUG_OPT $VIS_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --num $NUM --min $MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS $CHECKSUM_OPT >$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/7db1a446/test/system/continuous/start-scanners.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-scanners.sh index 9940d09,16a5964..0ef059a --- a/test/system/continuous/start-scanners.sh +++ b/test/system/continuous/start-scanners.sh @@@ -30,5 -30,5 +30,5 @@@ if [ -n "$AUTHS" ] ; the fi - pssh -h scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousScanner $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $SCANNER_SLEEP_TIME --numToScan $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 ++pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousScanner $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $SCANNER_SLEEP_TIME --numToScan $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/7db1a446/test/system/continuous/start-stats.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-stats.sh index 3aad413,5ece7f5..88b2030 --- a/test/system/continuous/start-stats.sh +++ b/test/system/continuous/start-stats.sh @@@ -26,13 -26,13 +26,13 @@@ cat $ACCUMULO_CONF_DIR/accumulo-env.sh 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 & +nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousStatsCollector --table $TABLE -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $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/7db1a446/test/system/continuous/start-walkers.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/start-walkers.sh index cb3a9b1,47d8cea..db00cfb --- a/test/system/continuous/start-walkers.sh +++ b/test/system/continuous/start-walkers.sh @@@ -30,5 -30,5 +30,5 @@@ if [ -n "$AUTHS" ] ; the fi - pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousWalk $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $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 ++pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.test.continuous.ContinuousWalk $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $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/7db1a446/test/system/continuous/stop-batchwalkers.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/stop-batchwalkers.sh index 4ceab9d,30a497d..32f2202 --- a/test/system/continuous/stop-batchwalkers.sh +++ b/test/system/continuous/stop-batchwalkers.sh @@@ -15,8 -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.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 ++pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "pkill -f [o]rg.apache.accumulo.test.continuous.ContinuousBatchWalker" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/stop-ingest.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/stop-ingest.sh index bd1113c,17267ef..01c6a38 --- a/test/system/continuous/stop-ingest.sh +++ b/test/system/continuous/stop-ingest.sh @@@ -15,8 -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.test.continuous.ContinuousIngest" < /dev/null -pssh -h $CONTINUOUS_CONF_DIR/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.test.continuous.ContinuousIngest" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/stop-scanners.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/stop-scanners.sh index 8d8b179,5c24c11..f53c3e5 --- a/test/system/continuous/stop-scanners.sh +++ b/test/system/continuous/stop-scanners.sh @@@ -15,8 -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.test.continuous.ContinuousScanner" < /dev/null -pssh -h $CONTINUOUS_CONF_DIR/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.test.continuous.ContinuousScanner" < /dev/null http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/stop-stats.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/stop-stats.sh index 10a9ffc,50c6058..cada583 --- a/test/system/continuous/stop-stats.sh +++ b/test/system/continuous/stop-stats.sh @@@ -15,8 -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 +pkill -f org.apache.accumulo.test.continuous.ContinuousStatsCollector http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db1a446/test/system/continuous/stop-walkers.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/stop-walkers.sh index 8d305c2,dae7254..f86c34d --- a/test/system/continuous/stop-walkers.sh +++ b/test/system/continuous/stop-walkers.sh @@@ -15,8 -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.test.continuous.ContinuousWalk" < /dev/null -pssh -h $CONTINUOUS_CONF_DIR/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.test.continuous.ContinuousWalk" < /dev/null