Author: tgraves
Date: Mon Oct 8 19:04:43 2012
New Revision: 1395726
URL: http://svn.apache.org/viewvc?rev=1395726&view=rev
Log:
merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mapred-config.sh
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1395726&r1=1395725&r2=1395726&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon
Oct 8 19:04:43 2012
@@ -26,6 +26,9 @@ Release 2.0.3-alpha - Unreleased
MAPREDUCE-4681. Fix unit tests broken by HDFS-3910. (acmurthy)
+ MAPREDUCE-4712. mr-jobhistory-daemon.sh doesn't accept --config
+ (Vinod Kumar Vavilapalli via tgraves)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mapred-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mapred-config.sh?rev=1395726&r1=1395725&r2=1395726&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mapred-config.sh
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mapred-config.sh
Mon Oct 8 19:04:43 2012
@@ -39,11 +39,12 @@ else
exit
fi
-# some more specific variables
-export
HADOOP_MAPRED_LOG_DIR=${HADOOP_MAPRED_LOG_DIR:-${HADOOP_MAPRED_HOME}/logs}
-export HADOOP_MAPRED_LOGFILE=${HADOOP_MAPRED_LOGFILE:-hadoop.log}
-
+# Only set locally to use in HADOOP_OPTS. No need to export.
+# The following defaults are useful when somebody directly invokes bin/mapred.
+HADOOP_MAPRED_LOG_DIR=${HADOOP_MAPRED_LOG_DIR:-${HADOOP_MAPRED_HOME}/logs}
+HADOOP_MAPRED_LOGFILE=${HADOOP_MAPRED_LOGFILE:-hadoop.log}
HADOOP_MAPRED_ROOT_LOGGER=${HADOOP_MAPRED_ROOT_LOGGER:-INFO,console}
+
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_MAPRED_LOG_DIR"
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_MAPRED_LOGFILE"
export HADOOP_OPTS="$HADOOP_OPTS
-Dhadoop.root.logger=${HADOOP_MAPRED_ROOT_LOGGER}"
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh?rev=1395726&r1=1395725&r2=1395726&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh
Mon Oct 8 19:04:43 2012
@@ -36,6 +36,12 @@ fi
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
+DEFAULT_LIBEXEC_DIR="$bin"/../libexec
+HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
+if [ -e ${HADOOP_LIBEXEC_DIR}/mapred-config.sh ]; then
+ . $HADOOP_LIBEXEC_DIR/mapred-config.sh
+fi
+
# get arguments
startStop=$1
shift
@@ -68,10 +74,6 @@ export HADOOP_MAPRED_LOGFILE=mapred-$HAD
export HADOOP_MAPRED_ROOT_LOGGER=${HADOOP_MAPRED_ROOT_LOGGER:-INFO,RFA}
export HADOOP_JHS_LOGGER=${HADOOP_JHS_LOGGER:-INFO,JSA}
-DEFAULT_LIBEXEC_DIR="$bin"/../libexec
-HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
-. $HADOOP_LIBEXEC_DIR/mapred-config.sh
-
if [ -f "${HADOOP_CONF_DIR}/mapred-env.sh" ]; then
. "${HADOOP_CONF_DIR}/mapred-env.sh"
fi
