Mailing-List: contact commits-help@pig.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@pig.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1603569 - in /pig/trunk: CHANGES.txt conf/pig.properties
 src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
Date: Wed, 18 Jun 2014 18:42:31 -0000
To: commits@pig.apache.org
From: daijy@apache.org
Message-Id: <20140618184231.E35F82388868@eris.apache.org>

Author: daijy
Date: Wed Jun 18 18:42:31 2014
New Revision: 1603569

URL: http://svn.apache.org/r1603569
Log:
PIG-4015: Provide a way to disable auto-parallism in tez

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/conf/pig.properties
    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=1603569&r1=1603568&r2=1603569&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jun 18 18:42:31 2014
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
  
 IMPROVEMENTS
 
+PIG-4015: Provide a way to disable auto-parallism in tez (daijy)
+
 PIG-3846: Implement automatic reducer parallelism (daijy)
 
 PIG-3939: SPRINTF function to format strings using a printf-style template (mrflip via cheolsoo)

Modified: pig/trunk/conf/pig.properties
URL: http://svn.apache.org/viewvc/pig/trunk/conf/pig.properties?rev=1603569&r1=1603568&r2=1603569&view=diff
==============================================================================
--- pig/trunk/conf/pig.properties (original)
+++ pig/trunk/conf/pig.properties Wed Jun 18 18:42:31 2014
@@ -554,3 +554,8 @@ hcat.bin=/usr/local/hcat/bin/hcat
 # testing a live cluster, disable with the -N option. See PIG-3642.
 #
 # opt.fetch=true
+
+# Enable auto parallelism in tez. This should be used by default unless
+# you encounter some bug in automatic parallelism. If set to false, use 1 as
+# default parallelism
+pig.tez.auto.parallelism=false

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=1603569&r1=1603568&r2=1603569&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 Wed Jun 18 18:42:31 2014
@@ -63,6 +63,10 @@ public class TezLauncher extends Launche
 
     @Override
     public PigStats launchPig(PhysicalPlan php, String grpName, PigContext pc) throws Exception {
+        if (pc.defaultParallel == -1 && 
+                !Boolean.parseBoolean(pc.getProperties().getProperty("pig.tez.auto.parallelism", "true"))) {
+            pc.defaultParallel = 1;
+        }
         aggregateWarning = Boolean.parseBoolean(pc.getProperties().getProperty("aggregate.warning", "false"));
         Configuration conf = ConfigurationUtil.toConfiguration(pc.getProperties(), true);