This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch revert-6042-MAPREDUCE-7453
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c19d5e860d05f475417e9d8dc85ca3b14d002c57
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Wed Sep 20 08:01:44 2023 +0800
Revert "MAPREDUCE-7453. Container logs are missing when
yarn.app.container.log.filesize is set to default value 0. (#6042) Contributed
by Chenyu Zheng."
This reverts commit ab2bc90e090564b7466ab1b759fbb849612ae82b.
---
.../src/main/java/org/apache/hadoop/mapred/TaskLog.java | 3 +--
.../src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java | 6 ++----
.../src/main/resources/mapred-default.xml | 7 ++++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
index fdfa3e7710f4..a0223dedd64c 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
@@ -466,8 +466,7 @@ public class TaskLog {
}
public static long getTaskLogLimitBytes(Configuration conf) {
- return conf.getLong(JobContext.TASK_USERLOG_LIMIT,
JobContext.DEFAULT_TASK_USERLOG_LIMIT) *
- 1024;
+ return conf.getLong(JobContext.TASK_USERLOG_LIMIT, 0) * 1024;
}
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
index 24689e09daf1..8ec984e777bb 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
@@ -410,8 +410,6 @@ public interface MRJobConfig {
public static final String TASK_USERLOG_LIMIT =
"mapreduce.task.userlog.limit.kb";
- public static final int DEFAULT_TASK_USERLOG_LIMIT = 10240;
-
public static final String MAP_SORT_SPILL_PERCENT =
"mapreduce.map.sort.spill.percent";
public static final String MAP_INPUT_FILE = "mapreduce.map.input.file";
@@ -760,11 +758,11 @@ public interface MRJobConfig {
public static final String MR_AM_LOG_KB =
MR_AM_PREFIX + "container.log.limit.kb";
- public static final int DEFAULT_MR_AM_LOG_KB = 10240;
+ public static final int DEFAULT_MR_AM_LOG_KB = 0; // don't roll
public static final String MR_AM_LOG_BACKUPS =
MR_AM_PREFIX + "container.log.backups";
- public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0; // don't roll
+ public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0;
/**The number of splits when reporting progress in MR*/
public static final String MR_AM_NUM_PROGRESS_SPLITS =
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 493e4c3a37e9..a6d68acda34a 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
@@ -823,15 +823,16 @@
<property>
<name>mapreduce.task.userlog.limit.kb</name>
- <value>10240</value>
- <description>The maximum size of user-logs of each task in KB.
+ <value>0</value>
+ <description>The maximum size of user-logs of each task in KB. 0 disables
the cap.
</description>
</property>
<property>
<name>yarn.app.mapreduce.am.container.log.limit.kb</name>
- <value>10240</value>
+ <value>0</value>
<description>The maximum size of the MRAppMaster attempt container logs in
KB.
+ 0 disables the cap.
</description>
</property>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
