Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 55657110BA for ; Sun, 22 Jun 2014 03:10:21 +0000 (UTC) Received: (qmail 57178 invoked by uid 500); 22 Jun 2014 03:10:21 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 57137 invoked by uid 500); 22 Jun 2014 03:10:21 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 57127 invoked by uid 99); 22 Jun 2014 03:10:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jun 2014 03:10:21 +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; Sun, 22 Jun 2014 03:10:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5D5BC2388868; Sun, 22 Jun 2014 03:09:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1604515 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java Date: Sun, 22 Jun 2014 03:09:56 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140622030956.5D5BC2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: daijy Date: Sun Jun 22 03:09:55 2014 New Revision: 1604515 URL: http://svn.apache.org/r1604515 Log: PIG-4031: Provide Counter aggregation for Tez Modified: pig/trunk/CHANGES.txt pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java Modified: pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1604515&r1=1604514&r2=1604515&view=diff ============================================================================== --- pig/trunk/CHANGES.txt (original) +++ pig/trunk/CHANGES.txt Sun Jun 22 03:09:55 2014 @@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES IMPROVEMENTS +PIG-4031: Provide Counter aggregation for Tez (daijy) + PIG-4028: add a flag to control the ivy resolve/retrieve output (gkesavan via daijy) PIG-4015: Provide a way to disable auto-parallism in tez (daijy) Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java?rev=1604515&r1=1604514&r2=1604515&view=diff ============================================================================== --- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java (original) +++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java Sun Jun 22 03:09:55 2014 @@ -20,7 +20,9 @@ package org.apache.pig.backend.hadoop.ex import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,6 +30,7 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.lib.jobcontrol.ControlledJob; import org.apache.pig.PigConfiguration; +import org.apache.pig.PigWarning; import org.apache.pig.backend.BackendException; import org.apache.pig.backend.executionengine.ExecException; import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil; @@ -39,6 +42,7 @@ import org.apache.pig.backend.hadoop.exe import org.apache.pig.impl.PigContext; import org.apache.pig.impl.io.FileLocalizer; import org.apache.pig.impl.plan.CompilationMessageCollector.MessageType; +import org.apache.pig.impl.plan.CompilationMessageCollector; import org.apache.pig.impl.plan.PlanException; import org.apache.pig.impl.plan.VisitorException; import org.apache.pig.impl.util.UDFContext; @@ -159,6 +163,19 @@ public class TezLauncher extends Launche notifyFinishedOrFailed(job); tezStats.accumulateStats(job); + Map warningAggMap = new HashMap(); + + if (aggregateWarning && job.getJobState() == ControlledJob.State.SUCCESS) { + for (Vertex vertex : job.getDAG().getVertices()) { + String vertexName = vertex.getVertexName(); + Map> counterGroups = job.getVertexCounters(vertexName); + computeWarningAggregate(counterGroups, warningAggMap); + } + } + + if(aggregateWarning) { + CompilationMessageCollector.logAggregate(warningAggMap, MessageType.Warning, log) ; + } tezScriptState.emitProgressUpdatedNotification(100); } @@ -188,6 +205,25 @@ public class TezLauncher extends Launche return tezStats; } + void computeWarningAggregate(Map> counterGroups, Map aggMap) { + for (Map counters : counterGroups.values()) { + for (Enum e : PigWarning.values()) { + if (counters.containsKey(e.toString())) { + if (aggMap.containsKey(e.toString())) { + Long currentCount = aggMap.get(e.toString()); + currentCount = (currentCount == null ? 0 : currentCount); + if (counters != null) { + currentCount += counters.get(e.toString()); + } + aggMap.put(e, currentCount); + } else { + aggMap.put(e, counters.get(e.toString())); + } + } + } + } + } + private void notifyStarted(TezJob job) throws IOException { for (Vertex v : job.getDAG().getVertices()) { TezTaskStats tts = tezStats.getVertexStats(v.getVertexName());