Merge -c 1188999 from trunk to branch-0.23 to complete fix for MAPREDUCE-3269.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189000 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-26 02:17:05 +00:00
parent d78033e453
commit 4dd5c3169d
3 changed files with 6 additions and 0 deletions

View File

@ -1712,6 +1712,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3263. Fixed the MAPREDUCE-3028 commit which broke MR1. (Hitesh
Shah via acmurthy)
MAPREDUCE-3269. Fixed log4j properties to correctly set logging options
for JobHistoryServer vis-a-vis JobSummary logs. (mahadev via acmurthy)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

View File

@ -176,6 +176,8 @@ if [ "$YARN_LOGFILE" = "" ]; then
YARN_LOGFILE='yarn.log'
fi
YARN_JOB_HISTORYSERVER_OPTS="-Dmapred.jobsummary.logger=${YARN_JHS_LOGGER:-INFO,console}"
# restore ordinary behaviour
unset IFS

View File

@ -86,6 +86,7 @@ fi
# some variables
export YARN_LOGFILE=yarn-$YARN_IDENT_STRING-$command-$HOSTNAME.log
export YARN_ROOT_LOGGER="INFO,DRFA"
export YARN_JHS_LOGGER="INFO,JSA"
log=$YARN_LOG_DIR/yarn-$YARN_IDENT_STRING-$command-$HOSTNAME.out
pid=$YARN_PID_DIR/yarn-$YARN_IDENT_STRING-$command.pid