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/2ef4626d Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/2ef4626d Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/2ef4626d Branch: refs/heads/master Commit: 2ef4626d3b3dfeeb47120f8db8f2809e04e440a0 Parents: 74ccd2d Author: Siddharth Seth <[email protected]> Authored: Fri Aug 14 13:57:26 2015 -0700 Committer: Siddharth Seth <[email protected]> Committed: Fri Aug 21 18:15: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/2ef4626d/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/2ef4626d/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);
