You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/02/03 23:16:29 UTC

git commit: TEZ-790. Addendum patch for TEZ-784: failing config constants renaming is incomplete. (Tassapol Athiapinya via bikas)

Updated Branches:
  refs/heads/master 29a97cc1f -> 76175a283


TEZ-790. Addendum patch for TEZ-784: failing config constants renaming is incomplete. (Tassapol Athiapinya via bikas)


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

Branch: refs/heads/master
Commit: 76175a283390f727bb9a2dbba9b0180a28895cef
Parents: 29a97cc
Author: Bikas Saha <bi...@apache.org>
Authored: Mon Feb 3 14:16:18 2014 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Mon Feb 3 14:16:18 2014 -0800

----------------------------------------------------------------------
 .../test/java/org/apache/tez/test/TestFaultTolerance.java    | 8 ++++----
 tez-tests/src/test/java/org/apache/tez/test/TestInput.java   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/76175a28/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
index 0ce2bed..b56365e 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
@@ -199,7 +199,7 @@ public class TestFaultTolerance {
     testConf.setBoolean(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_DO_FAIL_AND_EXIT, "v2"), true);
     testConf.set(TestInput.getVertexConfName(
-        TestInput.TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
+        TestInput.TEZ_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
     testConf.set(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_FAILING_TASK_ATTEMPT, "v2"), "0");
     testConf.set(TestInput.getVertexConfName(
@@ -215,7 +215,7 @@ public class TestFaultTolerance {
     testConf.setBoolean(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_DO_FAIL, "v2"), true);
     testConf.set(TestInput.getVertexConfName(
-        TestInput.TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
+        TestInput.TEZ_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
     testConf.set(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_FAILING_TASK_ATTEMPT, "v2"), "0");
     testConf.set(TestInput.getVertexConfName(
@@ -231,7 +231,7 @@ public class TestFaultTolerance {
     testConf.setBoolean(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_DO_FAIL, "v2"), true);
     testConf.set(TestInput.getVertexConfName(
-        TestInput.TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "0,1");
+        TestInput.TEZ_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "0,1");
     testConf.set(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_FAILING_TASK_ATTEMPT, "v2"), "0");
     testConf.set(TestInput.getVertexConfName(
@@ -247,7 +247,7 @@ public class TestFaultTolerance {
     testConf.setBoolean(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_DO_FAIL, "v2"), true);
     testConf.set(TestInput.getVertexConfName(
-        TestInput.TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
+        TestInput.TEZ_FAILING_INPUT_FAILING_TASK_INDEX, "v2"), "1");
     testConf.set(TestInput.getVertexConfName(
         TestInput.TEZ_FAILING_INPUT_FAILING_TASK_ATTEMPT, "v2"), "0");
     testConf.set(TestInput.getVertexConfName(

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/76175a28/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
index b5decb5..aa8655b 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
@@ -98,7 +98,7 @@ public class TestInput implements LogicalInput {
    * separated list of +ve integers. -1 means all tasks. E.g. 0 means the first
    * task in the vertex will have failing inputs.
    */
-  public static String TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX =
+  public static String TEZ_FAILING_INPUT_FAILING_TASK_INDEX =
       "tez.failing-input.failing-task-index";
   /**
    * Which task attempts will fail the input. This is a comma separated list of
@@ -198,7 +198,7 @@ public class TestInput implements LogicalInput {
       if (doFail) {
         for (String failingIndex : 
           conf.getTrimmedStringCollection(
-              getVertexConfName(TEZ_AM_FAILING_INPUT_FAILING_TASK_INDEX, vName))) {
+              getVertexConfName(TEZ_FAILING_INPUT_FAILING_TASK_INDEX, vName))) {
           LOG.info("Adding failing task index: " + failingIndex);
           failingTaskIndices.add(Integer.valueOf(failingIndex));
         }