Author: daijy
Date: Mon Jan 12 21:33:28 2015
New Revision: 1651205
URL: http://svn.apache.org/r1651205
Log:
PIG-4378: Better way to fix tez local mode test hanging
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy/libraries.properties
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
pig/trunk/test/org/apache/pig/test/TestMultiQueryBasic.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1651205&r1=1651204&r2=1651205&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jan 12 21:33:28 2015
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-4378: Better way to fix tez local mode test hanging (daijy)
+
PIG-4358: Add test cases for utf8 chinese in Pig (nmaheshwari via daijy)
PIG-4370: HBaseStorage should support delete markers (bridiver via daijy)
Modified: pig/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1651205&r1=1651204&r2=1651205&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Mon Jan 12 21:33:28 2015
@@ -93,6 +93,6 @@ mockito.version=1.8.4
jansi.version=1.9
asm.version=3.3.1
snappy-java.version=1.1.0.1
-tez.version=0.5.2
+tez.version=0.5.3
parquet-pig-bundle.version=1.2.3
snappy.version=0.2
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=1651205&r1=1651204&r2=1651205&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
Mon Jan 12 21:33:28 2015
@@ -75,6 +75,7 @@ import org.apache.tez.dag.api.DAG;
import org.apache.tez.dag.api.TezConfiguration;
import org.apache.tez.dag.api.Vertex;
import org.apache.tez.dag.api.client.DAGStatus;
+import org.apache.tez.dag.app.dag.impl.DAGSchedulerNaturalOrderControlled;
import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -111,6 +112,7 @@ public class TezLauncher extends Launche
pc.getProperties().setProperty(TezConfiguration.TEZ_LOCAL_MODE,
"true");
pc.getProperties().setProperty(TezRuntimeConfiguration.TEZ_RUNTIME_OPTIMIZE_LOCAL_FETCH,
"true");
pc.getProperties().setProperty("tez.ignore.lib.uris", "true");
+ pc.getProperties().setProperty("tez.am.dag.scheduler.class",
DAGSchedulerNaturalOrderControlled.class.getName());
}
Configuration conf =
ConfigurationUtil.toConfiguration(pc.getProperties(), true);
if (pc.defaultParallel == -1 &&
!conf.getBoolean(PigConfiguration.PIG_TEZ_AUTO_PARALLELISM, true)) {
Modified: pig/trunk/test/org/apache/pig/test/TestMultiQueryBasic.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMultiQueryBasic.java?rev=1651205&r1=1651204&r2=1651205&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMultiQueryBasic.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMultiQueryBasic.java Mon Jan 12
21:33:28 2015
@@ -69,10 +69,6 @@ public class TestMultiQueryBasic {
"test/org/apache/pig/test/data/passwd2", "passwd2");
Properties props = new Properties();
props.setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, ""+true);
- // Turn on multithread, otherwise tez local mode hang
- // However, we cannot turn on multithread in general cuz Pig backend
is not
- // multithread safe yet
- props.setProperty("tez.am.inline.task.execution.max-tasks", "5");
props.setProperty("tez.runtime.io.sort.mb", "10");
myPig = new PigServer(Util.getLocalTestMode(), props);
}
