You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2015/11/26 05:07:10 UTC
tez git commit: TEZ-2581. Addendum patch for hadoop2.2/2.4 (zjffdu)
Repository: tez
Updated Branches:
refs/heads/master 28f30b0ef -> f6a40b659
TEZ-2581. Addendum patch for hadoop2.2/2.4 (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/f6a40b65
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f6a40b65
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f6a40b65
Branch: refs/heads/master
Commit: f6a40b659d9680b4b98a564a81e566b4f0c7a866
Parents: 28f30b0
Author: Jeff Zhang <zj...@apache.org>
Authored: Thu Nov 26 12:06:36 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Thu Nov 26 12:06:36 2015 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java | 2 +-
tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/f6a40b65/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
index 9a45859..579bdba 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
@@ -675,7 +675,7 @@ public class TestRecoveryParser {
rService.handle(new DAGHistoryEvent(dagID, t2v2FinishedEvent));
// attempts under t0v2
- ContainerId containerId = ContainerId.newContainerId(appAttemptId, 1);
+ ContainerId containerId = ContainerId.newInstance(appAttemptId, 1);
NodeId nodeId = NodeId.newInstance("localhost", 9999);
TezTaskAttemptID ta0t0v2Id = TezTaskAttemptID.getInstance(t0v2Id, 0);
TaskAttemptStartedEvent ta0t0v2StartedEvent = new TaskAttemptStartedEvent(
http://git-wip-us.apache.org/repos/asf/tez/blob/f6a40b65/tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java b/tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java
index 45582a1..d13298f 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestRecovery.java
@@ -144,7 +144,7 @@ public class TestRecovery {
TezVertexID vertexId0 = TezVertexID.getInstance(dagId, 0);
TezVertexID vertexId1 = TezVertexID.getInstance(dagId, 1);
TezVertexID vertexId2 = TezVertexID.getInstance(dagId, 2);
- ContainerId containerId = ContainerId.newContainerId(
+ ContainerId containerId = ContainerId.newInstance(
ApplicationAttemptId.newInstance(appId, 1), 1);
NodeId nodeId = NodeId.newInstance("localhost", 10);
@@ -300,7 +300,7 @@ public class TestRecovery {
TezVertexID vertexId0 = TezVertexID.getInstance(dagId, 0);
TezVertexID vertexId1 = TezVertexID.getInstance(dagId, 1);
TezVertexID vertexId2 = TezVertexID.getInstance(dagId, 2);
- ContainerId containerId = ContainerId.newContainerId(
+ ContainerId containerId = ContainerId.newInstance(
ApplicationAttemptId.newInstance(appId, 1), 1);
NodeId nodeId = NodeId.newInstance("localhost", 10);
List<TezEvent> initGeneratedEvents = Lists.newArrayList(