Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27E8518E85 for ; Thu, 26 Nov 2015 04:07:11 +0000 (UTC) Received: (qmail 89527 invoked by uid 500); 26 Nov 2015 04:07:10 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 89489 invoked by uid 500); 26 Nov 2015 04:07:10 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 89480 invoked by uid 99); 26 Nov 2015 04:07:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 04:07:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E75FE17D2; Thu, 26 Nov 2015 04:07:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjffdu@apache.org To: commits@tez.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-2581. Addendum patch for hadoop2.2/2.4 (zjffdu) Date: Thu, 26 Nov 2015 04:07:10 +0000 (UTC) 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 Authored: Thu Nov 26 12:06:36 2015 +0800 Committer: Jeff Zhang 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 initGeneratedEvents = Lists.newArrayList(