MAPREDUCE-2754. Fixed MR AM stdout, stderr and syslog to redirect to correct log-files. Contributed by Ravi Teja Ch N V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1174194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d773bf0fb5
commit
4806d7ba74
@ -1398,6 +1398,9 @@ Release 0.23.0 - Unreleased
|
|||||||
|
|
||||||
MAPREDUCE-3044. Pipes jobs stuck without making progress. (mahadev)
|
MAPREDUCE-3044. Pipes jobs stuck without making progress. (mahadev)
|
||||||
|
|
||||||
|
MAPREDUCE-2754. Fixed MR AM stdout, stderr and syslog to redirect to
|
||||||
|
correct log-files. (Ravi Teja Ch N V via vinodkv)
|
||||||
|
|
||||||
Release 0.22.0 - Unreleased
|
Release 0.22.0 - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
@ -245,8 +245,8 @@ public static List<String> getVMCommand(
|
|||||||
|
|
||||||
// Finally add the jvmID
|
// Finally add the jvmID
|
||||||
vargs.add(String.valueOf(jvmID.getId()));
|
vargs.add(String.valueOf(jvmID.getId()));
|
||||||
vargs.add("1>" + getTaskLogFile(TaskLog.LogName.STDERR));
|
vargs.add("1>" + getTaskLogFile(TaskLog.LogName.STDOUT));
|
||||||
vargs.add("2>" + getTaskLogFile(TaskLog.LogName.STDOUT));
|
vargs.add("2>" + getTaskLogFile(TaskLog.LogName.STDERR));
|
||||||
|
|
||||||
// Final commmand
|
// Final commmand
|
||||||
StringBuilder mergedCommand = new StringBuilder();
|
StringBuilder mergedCommand = new StringBuilder();
|
||||||
|
@ -462,7 +462,7 @@ public interface MRJobConfig {
|
|||||||
/** The log directory for the containers */
|
/** The log directory for the containers */
|
||||||
public static final String TASK_LOG_DIR = MR_PREFIX + "container.log.dir";
|
public static final String TASK_LOG_DIR = MR_PREFIX + "container.log.dir";
|
||||||
|
|
||||||
public static final String TASK_LOG_SIZE = MR_PREFIX + "log.filesize";
|
public static final String TASK_LOG_SIZE = MR_PREFIX + "container.log.filesize";
|
||||||
|
|
||||||
public static final String MAPREDUCE_V2_CHILD_CLASS =
|
public static final String MAPREDUCE_V2_CHILD_CLASS =
|
||||||
"org.apache.hadoop.mapred.YarnChild";
|
"org.apache.hadoop.mapred.YarnChild";
|
||||||
|
@ -310,9 +310,12 @@ public ApplicationSubmissionContext createApplicationSubmissionContext(
|
|||||||
// Setup the command to run the AM
|
// Setup the command to run the AM
|
||||||
Vector<CharSequence> vargs = new Vector<CharSequence>(8);
|
Vector<CharSequence> vargs = new Vector<CharSequence>(8);
|
||||||
vargs.add(Environment.JAVA_HOME.$() + "/bin/java");
|
vargs.add(Environment.JAVA_HOME.$() + "/bin/java");
|
||||||
vargs.add("-Dhadoop.root.logger="
|
|
||||||
+ conf.get(MRJobConfig.MR_AM_LOG_OPTS,
|
long logSize = TaskLog.getTaskLogLength(new JobConf(conf));
|
||||||
MRJobConfig.DEFAULT_MR_AM_LOG_OPTS) + ",console");
|
vargs.add("-Dlog4j.configuration=container-log4j.properties");
|
||||||
|
vargs.add("-D" + MRJobConfig.TASK_LOG_DIR + "="
|
||||||
|
+ ApplicationConstants.LOG_DIR_EXPANSION_VAR);
|
||||||
|
vargs.add("-D" + MRJobConfig.TASK_LOG_SIZE + "=" + logSize);
|
||||||
|
|
||||||
vargs.add(conf.get(MRJobConfig.MR_AM_COMMAND_OPTS,
|
vargs.add(conf.get(MRJobConfig.MR_AM_COMMAND_OPTS,
|
||||||
MRJobConfig.DEFAULT_MR_AM_COMMAND_OPTS));
|
MRJobConfig.DEFAULT_MR_AM_COMMAND_OPTS));
|
||||||
|
Loading…
Reference in New Issue
Block a user