Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8182D9EF8 for ; Mon, 31 Oct 2011 15:51:56 +0000 (UTC) Received: (qmail 91209 invoked by uid 500); 31 Oct 2011 15:51:56 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 91098 invoked by uid 500); 31 Oct 2011 15:51:56 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 91055 invoked by uid 99); 31 Oct 2011 15:51:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2011 15:51:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2011 15:51:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A00062388978; Mon, 31 Oct 2011 15:51:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1195535 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java Date: Mon, 31 Oct 2011 15:51:32 -0000 To: mapreduce-commits@hadoop.apache.org From: amarrk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111031155132.A00062388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amarrk Date: Mon Oct 31 15:51:32 2011 New Revision: 1195535 URL: http://svn.apache.org/viewvc?rev=1195535&view=rev Log: MAPREDUCE-3241. [Rumen] Fix Rumen to ignore the AMStartedEvent. (amarrk) Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1195535&r1=1195534&r2=1195535&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Oct 31 15:51:32 2011 @@ -30,6 +30,8 @@ Trunk (unreleased changes) BUG FIXES + MAPREDUCE-3241. [Rumen] Fix Rumen to ignore the AMStartedEvent. (amarrk) + MAPREDUCE-3166. [Rumen] Make Rumen use job history api instead of relying on current history file name format. (Ravi Gummadi) Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java?rev=1195535&r1=1195534&r2=1195535&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java Mon Oct 31 15:51:32 2011 @@ -28,6 +28,7 @@ import java.util.regex.Pattern; import org.apache.hadoop.mapred.TaskStatus; import org.apache.hadoop.mapreduce.TaskType; +import org.apache.hadoop.mapreduce.jobhistory.AMStartedEvent; import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent; import org.apache.hadoop.mapreduce.jobhistory.JobFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.JobInfoChangeEvent; @@ -129,7 +130,11 @@ public class JobBuilder { } // these are in lexicographical order by class name. - if (event instanceof JobFinishedEvent) { + if (event instanceof AMStartedEvent) { + // 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 JobFinishedEvent) { processJobFinishedEvent((JobFinishedEvent) event); } else if (event instanceof JobInfoChangeEvent) { processJobInfoChangeEvent((JobInfoChangeEvent) event);