Skip to content

Commit ab2bc90

Browse files
authored
MAPREDUCE-7453. Container logs are missing when yarn.app.container.log.filesize is set to default value 0. (#6042) Contributed by Chenyu Zheng.
Reviewed-by: Shilun Fan <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
1 parent e283375 commit ab2bc90

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@ public static long getTaskLogLength(JobConf conf) {
466466
}
467467

468468
public static long getTaskLogLimitBytes(Configuration conf) {
469-
return conf.getLong(JobContext.TASK_USERLOG_LIMIT, 0) * 1024;
469+
return conf.getLong(JobContext.TASK_USERLOG_LIMIT, JobContext.DEFAULT_TASK_USERLOG_LIMIT) *
470+
1024;
470471
}
471472

472473

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ public interface MRJobConfig {
410410

411411
public static final String TASK_USERLOG_LIMIT = "mapreduce.task.userlog.limit.kb";
412412

413+
public static final int DEFAULT_TASK_USERLOG_LIMIT = 10240;
414+
413415
public static final String MAP_SORT_SPILL_PERCENT = "mapreduce.map.sort.spill.percent";
414416

415417
public static final String MAP_INPUT_FILE = "mapreduce.map.input.file";
@@ -758,11 +760,11 @@ public interface MRJobConfig {
758760

759761
public static final String MR_AM_LOG_KB =
760762
MR_AM_PREFIX + "container.log.limit.kb";
761-
public static final int DEFAULT_MR_AM_LOG_KB = 0; // don't roll
763+
public static final int DEFAULT_MR_AM_LOG_KB = 10240;
762764

763765
public static final String MR_AM_LOG_BACKUPS =
764766
MR_AM_PREFIX + "container.log.backups";
765-
public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0;
767+
public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0; // don't roll
766768

767769
/**The number of splits when reporting progress in MR*/
768770
public static final String MR_AM_NUM_PROGRESS_SPLITS =

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,16 +823,15 @@
823823

824824
<property>
825825
<name>mapreduce.task.userlog.limit.kb</name>
826-
<value>0</value>
827-
<description>The maximum size of user-logs of each task in KB. 0 disables the cap.
826+
<value>10240</value>
827+
<description>The maximum size of user-logs of each task in KB.
828828
</description>
829829
</property>
830830

831831
<property>
832832
<name>yarn.app.mapreduce.am.container.log.limit.kb</name>
833-
<value>0</value>
833+
<value>10240</value>
834834
<description>The maximum size of the MRAppMaster attempt container logs in KB.
835-
0 disables the cap.
836835
</description>
837836
</property>
838837

0 commit comments

Comments
 (0)