tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject tez git commit: TEZ-2071. TestAMRecovery should set test names for test DAGs (zjffdu)
Date Thu, 12 Feb 2015 01:57:45 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 2f899a87f -> 0019ddc02


TEZ-2071. TestAMRecovery should set test names for test DAGs (zjffdu)

(cherry picked from commit b336ca0c44f13b7890a7706d23e36c1c090442a3)

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0019ddc0
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0019ddc0
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0019ddc0

Branch: refs/heads/branch-0.6
Commit: 0019ddc02015962c51bbe9eeaee1a62641397307
Parents: 2f899a8
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Wed Feb 11 13:57:24 2015 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Thu Feb 12 09:57:23 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/0019ddc0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 21b9457..d1a2a07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -141,6 +141,7 @@ TEZ-UI CHANGES (TEZ-8):
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2071. TestAMRecovery should set test names for test DAGs
   TEZ-1928. Tez local mode hang in Pig tez local mode.
   TEZ-1893. Verify invalid -1 parallelism in DAG.verify().
   TEZ-900. Confusing message for incorrect queue for some tez examples.

http://git-wip-us.apache.org/repos/asf/tez/blob/0019ddc0/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 8c3eff4..20d9e7f 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(


Mime
View raw message