Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,8 @@ public static long getTaskLogLength(JobConf conf) {
}

public static long getTaskLogLimitBytes(Configuration conf) {
return conf.getLong(JobContext.TASK_USERLOG_LIMIT, 0) * 1024;
return conf.getLong(JobContext.TASK_USERLOG_LIMIT, JobContext.DEFAULT_TASK_USERLOG_LIMIT) *
1024;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ 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";
Expand Down Expand Up @@ -758,11 +760,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 = 0; // don't roll
public static final int DEFAULT_MR_AM_LOG_KB = 10240;

public static final String MR_AM_LOG_BACKUPS =
MR_AM_PREFIX + "container.log.backups";
public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0;
public static final int DEFAULT_MR_AM_LOG_BACKUPS = 0; // don't roll

/**The number of splits when reporting progress in MR*/
public static final String MR_AM_NUM_PROGRESS_SPLITS =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -823,16 +823,15 @@

<property>
<name>mapreduce.task.userlog.limit.kb</name>
<value>0</value>
<description>The maximum size of user-logs of each task in KB. 0 disables the cap.
<value>10240</value>
<description>The maximum size of user-logs of each task in KB.
</description>
</property>

<property>
<name>yarn.app.mapreduce.am.container.log.limit.kb</name>
<value>0</value>
<value>10240</value>
<description>The maximum size of the MRAppMaster attempt container logs in KB.
0 disables the cap.
Comment on lines 825 to -835
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the defaults is an incompatible change. You are changing the behaviour of the application here?

</description>
</property>

Expand Down