MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster logs. (Rohit Agarwal via gera)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a0e3a4c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a0e3a4c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a0e3a4c4 Branch: refs/heads/YARN-2928 Commit: a0e3a4c450983205426e34f4701be8ab7c59d056 Parents: 1fde5be Author: Gera Shegalov <[email protected]> Authored: Fri May 1 16:13:56 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Mon May 4 12:58:59 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0e3a4c4/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1acbca0..1b23ee2 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -374,6 +374,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6341. Fix typo in mapreduce tutorial. (John Michael Luy via ozawa) + MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster + logs. (Rohit Agarwal via gera) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0e3a4c4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 2b25b59..fb761ba 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -746,7 +746,7 @@ org.apache.log4j.RollingFileAppender.maxBackupIndex. By default, ContainerLogAppender (CLA) is used, and container logs are not rolled. CRLA is enabled for the ApplicationMaster when both - mapreduce.task.userlog.limit.kb and + yarn.app.mapreduce.am.container.log.limit.kb and yarn.app.mapreduce.am.container.log.backups are greater than zero. </description> </property>
