accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template
Date Wed, 27 Jan 2016 16:37:16 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 d89846e8f -> d3316b3cf


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script
template


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

Branch: refs/heads/1.6
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Wed Jan 27 09:00:08 2016 -0500

----------------------------------------------------------------------
 test/system/continuous/mapred-setup.sh | 25 -------------------------
 test/system/continuous/run-moru.sh     |  6 +++++-
 test/system/continuous/run-verify.sh   |  6 +++++-
 3 files changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/mapred-setup.sh b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..0000000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/run-moru.sh b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 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"
 
 $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/d3316b3c/test/system/continuous/run-verify.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/run-verify.sh b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 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="";
 


Mime
View raw message