You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/12 08:27:48 UTC
[02/12] tez git commit: TEZ-2071. TestAMRecovery should set test
names for test DAGs (zjffdu)
TEZ-2071. TestAMRecovery should set test names for test DAGs (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b336ca0c
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b336ca0c
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b336ca0c
Branch: refs/heads/TEZ-2003
Commit: b336ca0c44f13b7890a7706d23e36c1c090442a3
Parents: eb9a034
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed Feb 11 13:57:24 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Feb 11 13:57:24 2015 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../java/org/apache/tez/test/TestAMRecovery.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/b336ca0c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ecb2a..950a0e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.7.0: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2071. TestAMRecovery should set test names for test DAGs.
TEZ-1233. Allow configuration of framework parameters per vertex.
TEZ-2045. TaskAttemptListener should not pull Tasks from AMContainer. Instead these should be registered with the listener.
TEZ-1914. VertexManager logic should not run on the central dispatcher
http://git-wip-us.apache.org/repos/asf/tez/blob/b336ca0c/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
index b8195a4..7ddfe59 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
@@ -200,7 +200,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexPartiallyFinished_Broadcast() throws Exception {
DAG dag =
- createDAG(ControlledImmediateStartVertexManager.class,
+ createDAG("VertexPartiallyFinished_Broadcast", ControlledImmediateStartVertexManager.class,
DataMovementType.BROADCAST, true);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -231,7 +231,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexCompletelyFinished_Broadcast() throws Exception {
DAG dag =
- createDAG(ControlledImmediateStartVertexManager.class,
+ createDAG("VertexCompletelyFinished_Broadcast", ControlledImmediateStartVertexManager.class,
DataMovementType.BROADCAST, false);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -262,7 +262,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexPartialFinished_One2One() throws Exception {
DAG dag =
- createDAG(ControlledInputReadyVertexManager.class,
+ createDAG("VertexPartialFinished_One2One", ControlledInputReadyVertexManager.class,
DataMovementType.ONE_TO_ONE, true);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -294,7 +294,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexCompletelyFinished_One2One() throws Exception {
DAG dag =
- createDAG(ControlledInputReadyVertexManager.class,
+ createDAG("VertexCompletelyFinished_One2One", ControlledInputReadyVertexManager.class,
DataMovementType.ONE_TO_ONE, false);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -326,7 +326,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexPartiallyFinished_ScatterGather() throws Exception {
DAG dag =
- createDAG(ControlledShuffleVertexManager.class,
+ createDAG("VertexPartiallyFinished_ScatterGather", ControlledShuffleVertexManager.class,
DataMovementType.SCATTER_GATHER, true);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -358,7 +358,7 @@ public class TestAMRecovery {
@Test(timeout = 120000)
public void testVertexCompletelyFinished_ScatterGather() throws Exception {
DAG dag =
- createDAG(ControlledShuffleVertexManager.class,
+ createDAG("VertexCompletelyFinished_ScatterGather", ControlledShuffleVertexManager.class,
DataMovementType.SCATTER_GATHER, false);
TezCounters counters = runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
assertEquals(4, counters.findCounter(DAGCounter.NUM_SUCCEEDED_TASKS).getValue());
@@ -391,7 +391,7 @@ public class TestAMRecovery {
tezConf.set(FAIL_ON_ATTEMPT, rand.nextInt(MAX_AM_ATTEMPT) + "");
LOG.info("Set FAIL_ON_ATTEMPT=" + tezConf.get(FAIL_ON_ATTEMPT));
DAG dag =
- createDAG(FailOnAttemptVertexManager.class,
+ createDAG("HighMaxAttempt", FailOnAttemptVertexManager.class,
DataMovementType.SCATTER_GATHER, false);
runDAGAndVerify(dag, DAGStatus.State.SUCCEEDED);
@@ -418,14 +418,14 @@ public class TestAMRecovery {
* @return
* @throws IOException
*/
- private DAG createDAG(Class vertexManagerClass, DataMovementType dmType,
+ private DAG createDAG(String dagName, Class vertexManagerClass, DataMovementType dmType,
boolean failOnParitialCompleted) throws IOException {
if (failOnParitialCompleted) {
tezConf.set(FAIL_ON_PARTIAL_FINISHED, "true");
} else {
tezConf.set(FAIL_ON_PARTIAL_FINISHED, "false");
}
- DAG dag = DAG.create("dag");
+ DAG dag = DAG.create(dagName);
UserPayload payload = UserPayload.create(null);
Vertex v1 = Vertex.create("v1", MyProcessor.getProcDesc(), 2);
v1.setVertexManagerPlugin(VertexManagerPluginDescriptor.create(