Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du 

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
(cherry picked from commit 9b973b7c83)
This commit is contained in:
Jian He 2014-10-22 10:43:20 -07:00
parent 8fdff5b791
commit cca473a321
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -204,6 +204,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in
client (Rohith via jlowe) client (Rohith via jlowe)
MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent.
(Junping Du via jianhe)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
View File

@ -26,6 +26,8 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.mapred.TaskStatus; import org.apache.hadoop.mapred.TaskStatus;
import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.TaskType;
@ -42,6 +44,7 @@ import org.apache.hadoop.mapreduce.jobhistory.JobQueueChangeEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobUnsuccessfulCompletionEvent; import org.apache.hadoop.mapreduce.jobhistory.JobUnsuccessfulCompletionEvent;
import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinished; import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinished;
import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent;
import org.apache.hadoop.mapreduce.jobhistory.NormalizedResourceEvent;
import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinished; import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinished;
import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent;
import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinished; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinished;
@ -66,6 +69,8 @@ public class JobBuilder {
private static final long BYTES_IN_MEG = private static final long BYTES_IN_MEG =
StringUtils.TraditionalBinaryPrefix.string2long("1m"); StringUtils.TraditionalBinaryPrefix.string2long("1m");
static final private Log LOG = LogFactory.getLog(JobBuilder.class);
private String jobID; private String jobID;
private boolean finalized = false; private boolean finalized = false;
@ -137,6 +142,9 @@ public class JobBuilder {
// ignore this event as Rumen currently doesnt need this event // ignore this event as Rumen currently doesnt need this event
//TODO Enhance Rumen to process this event and capture restarts //TODO Enhance Rumen to process this event and capture restarts
return; return;
} else if (event instanceof NormalizedResourceEvent) {
// Log an warn message as NormalizedResourceEvent shouldn't be written.
LOG.warn("NormalizedResourceEvent should be ignored in history server.");
} else if (event instanceof JobFinishedEvent) { } else if (event instanceof JobFinishedEvent) {
processJobFinishedEvent((JobFinishedEvent) event); processJobFinishedEvent((JobFinishedEvent) event);
} else if (event instanceof JobInfoChangeEvent) { } else if (event instanceof JobInfoChangeEvent) {
@ -173,7 +181,8 @@ public class JobBuilder {
processTaskUpdatedEvent((TaskUpdatedEvent) event); processTaskUpdatedEvent((TaskUpdatedEvent) event);
} else } else
throw new IllegalArgumentException( throw new IllegalArgumentException(
"JobBuilder.process(HistoryEvent): unknown event type"); "JobBuilder.process(HistoryEvent): unknown event type:"
+ event.getEventType() + " for event:" + event);
} }
static String extract(Properties conf, String[] names, String defaultValue) { static String extract(Properties conf, String[] names, String defaultValue) {