From 9b973b7c83a5b78452b852860bc6c7a0bad1e2d0 Mon Sep 17 00:00:00 2001 From: Jian He Date: Wed, 22 Oct 2014 10:43:20 -0700 Subject: [PATCH] MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du Conflicts: hadoop-mapreduce-project/CHANGES.txt --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/tools/rumen/JobBuilder.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ba8c673f615..76a713048b7 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -219,6 +219,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client (Rohith via jlowe) + MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. + (Junping Du via jianhe) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java index 53eea4bc8bb..eaa9547a966 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java @@ -26,6 +26,8 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; 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.mapreduce.TaskAttemptID; 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.MapAttemptFinished; 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.ReduceAttemptFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinished; @@ -66,6 +69,8 @@ public class JobBuilder { private static final long BYTES_IN_MEG = StringUtils.TraditionalBinaryPrefix.string2long("1m"); + static final private Log LOG = LogFactory.getLog(JobBuilder.class); + private String jobID; private boolean finalized = false; @@ -137,6 +142,9 @@ public class JobBuilder { // ignore this event as Rumen currently doesnt need this event //TODO Enhance Rumen to process this event and capture restarts 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) { processJobFinishedEvent((JobFinishedEvent) event); } else if (event instanceof JobInfoChangeEvent) { @@ -173,7 +181,8 @@ public class JobBuilder { processTaskUpdatedEvent((TaskUpdatedEvent) event); } else 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) {