From ff6492d6034af9e1f8b4cd5c9dd61640e2c1dcac Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Fri, 1 May 2015 16:13:56 -0700 Subject: [PATCH] MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster logs. (Rohit Agarwal via gera) (cherry picked from commit f1a152cc0adc071277c80637ea6f5faa0bf06a1a) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 9e31a30db98..963da70cd5c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -104,6 +104,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 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 f57ddd67dd9..9f1717d4f63 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 @@ -735,7 +735,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.