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-2579. Incorrect comparison of TaskAttemptId (zjffdu)
Date Tue, 30 Jun 2015 00:56:01 GMT
Repository: tez
Updated Branches:
  refs/heads/master 462d18501 -> 4a88ee1f0


TEZ-2579. Incorrect comparison of TaskAttemptId (zjffdu)


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

Branch: refs/heads/master
Commit: 4a88ee1f0e018c3732f6d33fe7e54ce461663948
Parents: 462d185
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Tue Jun 30 08:55:46 2015 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Tue Jun 30 08:55:46 2015 +0800

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4a88ee1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 63b7091..73e1497 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -263,6 +263,7 @@ Release 0.6.2: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2579. Incorrect comparison of TaskAttemptId
   TEZ-2549. Reduce Counter Load on the Timeline Server
   TEZ-2548. TezClient submitDAG can hang if the AM is in the process of shutting down.
   TEZ-2534. Error handling summary event when shutting down AM.

http://git-wip-us.apache.org/repos/asf/tez/blob/4a88ee1f/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index a5c507e..ef8e33a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -1097,7 +1097,7 @@ public class TaskImpl implements Task, EventHandler<TaskEvent>
{
 
       // issue kill to all other attempts
       for (TaskAttempt attempt : task.attempts.values()) {
-        if (attempt.getID() != task.successfulAttempt &&
+        if (!attempt.getID().equals(task.successfulAttempt) &&
             // This is okay because it can only talk us out of sending a
             //  TA_KILL message to an attempt that doesn't need one for
             //  other reasons.


Mime
View raw message