Revert "MAPREDUCE-7453. Container logs are missing when yarn.app.cont…

…ainer.log.filesize is set to default value 0. (apache#6042) Contributed by Chenyu Zheng." (apache#6103) This reverts commit ab2bc90.
jiajunmao · Feb 6, 2024 · c869627 · c869627
1 parent 32619e2
commit c869627
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/...e-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java b/...e-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
@@ -466,8 +466,7 @@ public static long getTaskLogLength(JobConf conf) {
   }
 
   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/...t/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/...t/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/...adoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/...adoop-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>