TEZ-2721. rebase 08/14 (sseth)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6cd001ac Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6cd001ac Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6cd001ac Branch: refs/heads/TEZ-2003 Commit: 6cd001ac6f2d5e1a2ffb3f7c03bb99029299df4a Parents: c18fff3 Author: Siddharth Seth <[email protected]> Authored: Fri Aug 14 13:57:26 2015 -0700 Committer: Siddharth Seth <[email protected]> Committed: Thu Aug 20 18:24:24 2015 -0700 ---------------------------------------------------------------------- TEZ-2003-CHANGES.txt | 1 + .../main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/6cd001ac/TEZ-2003-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-2003-CHANGES.txt b/TEZ-2003-CHANGES.txt index 154fb11..8a8e257 100644 --- a/TEZ-2003-CHANGES.txt +++ b/TEZ-2003-CHANGES.txt @@ -48,5 +48,6 @@ ALL CHANGES: TEZ-2678. Fix comments from reviews - part 1. TEZ-2707. Fix comments from reviews - part 2. TEZ-2713. Add tests for node handling when there's multiple schedulers. + TEZ-2721. rebase 08/14 INCOMPATIBLE CHANGES: http://git-wip-us.apache.org/repos/asf/tez/blob/6cd001ac/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java index 1c4102d..6957b1d 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java @@ -175,6 +175,7 @@ public class TaskAttemptImpl implements TaskAttempt, private TezTaskAttemptID creationCausalTA; private long creationTime; + private long scheduledTime; protected static final FailedTransitionHelper FAILED_HELPER = new FailedTransitionHelper(); @@ -439,7 +440,6 @@ public class TaskAttemptImpl implements TaskAttempt, this.vertex = this.task.getVertex(); this.creationCausalTA = schedulingCausalTA; this.creationTime = clock.getTime(); - this.schedulingCausalTA = schedulingCausalTA; this.reportedStatus = new TaskAttemptStatus(this.attemptId); initTaskAttemptStatus(reportedStatus);
