Author: daijy Date: Fri May 1 22:26:57 2015 New Revision: 1677244 URL: http://svn.apache.org/r1677244 Log: PIG-4524: Pig Minicluster unit tests broken by TEZ-2333
Modified: pig/branches/branch-0.15/CHANGES.txt pig/branches/branch-0.15/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java Modified: pig/branches/branch-0.15/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/branches/branch-0.15/CHANGES.txt?rev=1677244&r1=1677243&r2=1677244&view=diff ============================================================================== --- pig/branches/branch-0.15/CHANGES.txt (original) +++ pig/branches/branch-0.15/CHANGES.txt Fri May 1 22:26:57 2015 @@ -66,6 +66,8 @@ PIG-4333: Split BigData tests into multi BUG FIXES +PIG-4524: Pig Minicluster unit tests broken by TEZ-2333 (daijy) + PIG-4527: NON-ASCII Characters in Javadoc break 'ant docs' (nielsbasjes via daijy) PIG-4494: Pig's htrace version conflicts with that of hadoop 2.6.0 (daijy) Modified: pig/branches/branch-0.15/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java URL: http://svn.apache.org/viewvc/pig/branches/branch-0.15/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java?rev=1677244&r1=1677243&r2=1677244&view=diff ============================================================================== --- pig/branches/branch-0.15/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java (original) +++ pig/branches/branch-0.15/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java Fri May 1 22:26:57 2015 @@ -120,6 +120,7 @@ public class TezMiniCluster extends Mini Configuration tez_conf = new Configuration(false); // TODO PIG-3659 - Remove this once memory management is fixed tez_conf.set(TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB, "20"); + tez_conf.set(TezRuntimeConfiguration.TEZ_RUNTIME_OPTIMIZE_LOCAL_FETCH, "false"); tez_conf.set("tez.lib.uris", "hdfs:///tez,hdfs:///tez/lib"); // Set to a lower value so that tests don't get stuck for long because of 1 AM running at a time tez_conf.set(TezConfiguration.TEZ_SESSION_AM_DAG_SUBMIT_TIMEOUT_SECS, "20");