Updated Branches: refs/heads/master e00e39591 -> 99fd12de7
ACCUMULO-1806 make the better at finding the configuration file Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99fd12de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99fd12de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99fd12de Branch: refs/heads/master Commit: 99fd12de7eb8091e1ebced928f92706e6344049f Parents: e00e395 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Oct 23 18:13:08 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Oct 23 18:13:08 2013 -0400 ---------------------------------------------------------------------- test/system/continuous/run-moru.sh | 14 +++++++++++++- test/system/continuous/run-verify.sh | 14 +++++++++++++- test/system/continuous/start-agitator.sh | 13 ++++++++++++- test/system/continuous/start-batchwalkers.sh | 13 ++++++++++++- test/system/continuous/start-ingest.sh | 13 ++++++++++++- test/system/continuous/start-scanners.sh | 13 ++++++++++++- test/system/continuous/start-stats.sh | 13 ++++++++++++- test/system/continuous/start-walkers.sh | 13 ++++++++++++- test/system/continuous/stop-agitator.sh | 13 ++++++++++++- test/system/continuous/stop-batchwalkers.sh | 13 ++++++++++++- test/system/continuous/stop-ingest.sh | 13 ++++++++++++- test/system/continuous/stop-scanners.sh | 13 ++++++++++++- test/system/continuous/stop-stats.sh | 13 ++++++++++++- test/system/continuous/stop-walkers.sh | 13 ++++++++++++- 14 files changed, 170 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/run-moru.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/run-moru.sh b/test/system/continuous/run-moru.sh index 974f452..18f98e1 100755 --- a/test/system/continuous/run-moru.sh +++ b/test/system/continuous/run-moru.sh @@ -16,7 +16,19 @@ # limitations under the License. -. mapred-setup.sh +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +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 $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/99fd12de/test/system/continuous/run-verify.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/run-verify.sh b/test/system/continuous/run-verify.sh index a0c64d1..e6a87b3 100755 --- a/test/system/continuous/run-verify.sh +++ b/test/system/continuous/run-verify.sh @@ -16,7 +16,19 @@ # limitations under the License. -. mapred-setup.sh +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +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 AUTH_OPT=""; http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-agitator.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-agitator.sh b/test/system/continuous/start-agitator.sh index 980cd77..1266796 100755 --- a/test/system/continuous/start-agitator.sh +++ b/test/system/continuous/start-agitator.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh export HADOOP_PREFIX http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-batchwalkers.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-batchwalkers.sh b/test/system/continuous/start-batchwalkers.sh index 1c560f7..b3dd7be 100755 --- a/test/system/continuous/start-batchwalkers.sh +++ b/test/system/continuous/start-batchwalkers.sh @@ -16,7 +16,18 @@ # limitations under the License. -CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh DEBUG_OPT=""; http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-ingest.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-ingest.sh b/test/system/continuous/start-ingest.sh index a0d2149..4684829 100755 --- a/test/system/continuous/start-ingest.sh +++ b/test/system/continuous/start-ingest.sh @@ -16,7 +16,18 @@ # limitations under the License. -CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh DEBUG_OPT=""; http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-scanners.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-scanners.sh b/test/system/continuous/start-scanners.sh index 0ef059a..63b7fb3 100755 --- a/test/system/continuous/start-scanners.sh +++ b/test/system/continuous/start-scanners.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh DEBUG_OPT=""; http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-stats.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-stats.sh b/test/system/continuous/start-stats.sh index 88b2030..dab1a7a 100755 --- a/test/system/continuous/start-stats.sh +++ b/test/system/continuous/start-stats.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh mkdir -p $CONTINUOUS_LOG_DIR http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/start-walkers.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/start-walkers.sh b/test/system/continuous/start-walkers.sh index db00cfb..32fbd51 100755 --- a/test/system/continuous/start-walkers.sh +++ b/test/system/continuous/start-walkers.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh DEBUG_OPT=""; http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/stop-agitator.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-agitator.sh b/test/system/continuous/stop-agitator.sh index b853a55..72d9980 100755 --- a/test/system/continuous/stop-agitator.sh +++ b/test/system/continuous/stop-agitator.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh pkill -f agitator.pl http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/stop-batchwalkers.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-batchwalkers.sh b/test/system/continuous/stop-batchwalkers.sh index 502a7c8..0250656 100755 --- a/test/system/continuous/stop-batchwalkers.sh +++ b/test/system/continuous/stop-batchwalkers.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh 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/99fd12de/test/system/continuous/stop-ingest.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-ingest.sh b/test/system/continuous/stop-ingest.sh index 22f486a..15f1715 100755 --- a/test/system/continuous/stop-ingest.sh +++ b/test/system/continuous/stop-ingest.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh 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/99fd12de/test/system/continuous/stop-scanners.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-scanners.sh b/test/system/continuous/stop-scanners.sh index dd0d34c..8b1852b 100755 --- a/test/system/continuous/stop-scanners.sh +++ b/test/system/continuous/stop-scanners.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh 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/99fd12de/test/system/continuous/stop-stats.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-stats.sh b/test/system/continuous/stop-stats.sh index cada583..a806f2d 100755 --- a/test/system/continuous/stop-stats.sh +++ b/test/system/continuous/stop-stats.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh pkill -f org.apache.accumulo.test.continuous.ContinuousStatsCollector http://git-wip-us.apache.org/repos/asf/accumulo/blob/99fd12de/test/system/continuous/stop-walkers.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/stop-walkers.sh b/test/system/continuous/stop-walkers.sh index cfa786f..7e75969 100755 --- a/test/system/continuous/stop-walkers.sh +++ b/test/system/continuous/stop-walkers.sh @@ -15,7 +15,18 @@ # 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/} +# Start: Resolve Script Directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink + bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" + SOURCE="$(readlink "${SOURCE}")" + [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )" +script=$( basename "${SOURCE}" ) +# Stop: Resolve Script Directory + +CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousWalk'" < /dev/null
