ACCUMULO-2382 make continuous ingest test mapreduce jobs work with non-default CONTINUOUS_CONF_DIR
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fb0369a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fb0369a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fb0369a Branch: refs/heads/master Commit: 0fb0369af97c5d1a299b2ec9119374ab982bdf89 Parents: ef0eaaa Author: Sean Busbey <bus...@cloudera.com> Authored: Thu Mar 20 01:00:33 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Thu Mar 20 01:00:33 2014 -0500 ---------------------------------------------------------------------- test/system/continuous/run-moru.sh | 3 +-- test/system/continuous/run-verify.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fb0369a/test/system/continuous/run-moru.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/run-moru.sh b/test/system/continuous/run-moru.sh index 18f98e1..3133b05 100755 --- a/test/system/continuous/run-moru.sh +++ b/test/system/continuous/run-moru.sh @@ -27,8 +27,7 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory -CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} -. ${CONTINUOUS_CONF_DIR}/mapred-setup.sh +. ${bin}/mapred-setup.sh $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers $VERIFY_MAX_MAPS http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fb0369a/test/system/continuous/run-verify.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/run-verify.sh b/test/system/continuous/run-verify.sh index e6a87b3..72ecc14 100755 --- a/test/system/continuous/run-verify.sh +++ b/test/system/continuous/run-verify.sh @@ -27,8 +27,7 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory -CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} -. ${CONTINUOUS_CONF_DIR}/mapred-setup.sh +. ${bin}/mapred-setup.sh AUTH_OPT="";
