ACCUMULO-4116 merge to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259 Branch: refs/heads/master Commit: 90363259d25c5ccc43c209041d2824a7699040e3 Parents: edaa44a d3316b3 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Jan 27 09:01:37 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Jan 27 09:01:37 2016 -0500 ---------------------------------------------------------------------- test/system/continuous/mapred-setup.sh | 25 ------------------------- test/system/continuous/run-moru.sh | 8 ++++++++ test/system/continuous/run-verify.sh | 6 +++++- 3 files changed, 13 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-moru.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/run-moru.sh index f82d5f9,1c8d81a..9824f67 --- a/test/system/continuous/run-moru.sh +++ b/test/system/continuous/run-moru.sh @@@ -27,7 -27,11 +27,15 @@@ bin=$( cd -P "$( dirname "${SOURCE}" ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory ++<<<<<<< HEAD +. "${bin}/mapred-setup.sh" ++======= + CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} + . $CONTINUOUS_CONF_DIR/continuous-env.sh + . $ACCUMULO_CONF_DIR/accumulo-env.sh + + SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar" ++>>>>>>> 1.6 -$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 +"$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/90363259/test/system/continuous/run-verify.sh ---------------------------------------------------------------------- diff --cc test/system/continuous/run-verify.sh index c68c3ea,bd4df66..b163663 --- a/test/system/continuous/run-verify.sh +++ b/test/system/continuous/run-verify.sh @@@ -27,12 -27,20 +27,16 @@@ bin=$( cd -P "$( dirname "${SOURCE}" ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory - . "${bin}/mapred-setup.sh" + CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} + . $CONTINUOUS_CONF_DIR/continuous-env.sh + . $ACCUMULO_CONF_DIR/accumulo-env.sh + + SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar" AUTH_OPT=""; +[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS" -if [ -n "$VERIFY_AUTHS" ] ; then - AUTH_OPT="--auths $VERIFY_AUTHS"; -fi SCAN_OPT=--offline -if [ "$SCAN_OFFLINE" == "false" ] ; then - SCAN_OPT= -fi +[[ $SCAN_OFFLINE == false ]] && SCAN_OPT= -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.test.continuous.ContinuousVerify -Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS $SCAN_OPT +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" org.apache.accumulo.test.continuous.ContinuousVerify -Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" "$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers "$VERIFY_REDUCERS" "$SCAN_OPT"