MAPREDUCE-3372. HADOOP_PREFIX cannot be overridden. Contributed by Bruno Mahé.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1203488 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6a01c22755
commit
bd0fbbb942
@ -103,6 +103,9 @@ Release 0.23.1 - Unreleased
|
||||
MAPREDUCE-3373. Hadoop scripts unconditionally source
|
||||
"$bin"/../libexec/hadoop-config.sh. (Bruno Mahé via tomwhite)
|
||||
|
||||
MAPREDUCE-3372. HADOOP_PREFIX cannot be overridden.
|
||||
(Bruno Mahé via tomwhite)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
export HADOOP_PREFIX=../../..
|
||||
export HADOOP_PREFIX=${HADOOP_PREFIX:-../../..}
|
||||
|
||||
export CLASSPATH="$HADOOP_PREFIX/build/classes"
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
export HADOOP_PREFIX=../../../../..
|
||||
export HADOOP_PREFIX=${HADOOP_PREFIX:-../../../../..}
|
||||
|
||||
export CLASSPATH="$HADOOP_PREFIX/build/classes"
|
||||
export CLASSPATH=${CLASSPATH}:"$HADOOP_PREFIX/build/contrib/abacus/classes"
|
||||
|
@ -67,7 +67,7 @@ check_privsep_dir() {
|
||||
}
|
||||
|
||||
export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
|
||||
export HADOOP_PREFIX="/usr"
|
||||
export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
|
@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
|
||||
RETVAL=0
|
||||
PIDFILE="${HADOOP_PID_DIR}/hadoop-mapred-historyserver.pid"
|
||||
desc="Hadoop historyserver daemon"
|
||||
export HADOOP_PREFIX="/usr"
|
||||
export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
|
||||
|
||||
start() {
|
||||
echo -n $"Starting $desc (hadoop-historyserver): "
|
||||
|
Loading…
Reference in New Issue
Block a user