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 2014/11/14 08:26:44 UTC

tez git commit: Revert "TEZ-1772. Failing tests post TEZ-1737. (Jeff Zhang via hitesh)"

Repository: tez
Updated Branches:
  refs/heads/branch-0.5 d24953566 -> 202ce9767


Revert "TEZ-1772. Failing tests post TEZ-1737. (Jeff Zhang via hitesh)"

This reverts commit 16b21dfcb42bbb5514ef53da10563d9c7f8da283.


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

Branch: refs/heads/branch-0.5
Commit: 202ce97678c88e16c49e40c6d5b42f5a4fefe88c
Parents: d249535
Author: Jeff Zhang <zj...@apache.org>
Authored: Fri Nov 14 15:25:05 2014 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Fri Nov 14 15:25:05 2014 +0800

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 -
 .../org/apache/tez/dag/history/events/VertexFinishedEvent.java     | 2 --
 tez-dag/src/main/proto/HistoryEvents.proto                         | 1 -
 3 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/202ce976/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b98e379..e4222fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,7 +15,6 @@ ALL CHANGES:
   TEZ-1737. Should add taskNum in VertexFinishedEvent.
   TEZ-1770. Handle ConnectExceptions correctly when establishing connections to an NM which may be down.
   TEZ-1774. AppLaunched event for Timeline does not have start time set.
-  TEZ-1772. Failing tests post TEZ-1737.
 
 Release 0.5.2: 2014-11-07
 

http://git-wip-us.apache.org/repos/asf/tez/blob/202ce976/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
index d6e0b79..d1d7eef 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
@@ -98,7 +98,6 @@ public class VertexFinishedEvent implements HistoryEvent, SummaryEvent {
     VertexFinishedProto.Builder builder = VertexFinishedProto.newBuilder();
     builder.setVertexName(vertexName)
         .setVertexId(vertexID.toString())
-        .setNumTasks(numTasks)
         .setState(state.ordinal())
         .setFinishTime(finishTime);
     if (diagnostics != null) {
@@ -110,7 +109,6 @@ public class VertexFinishedEvent implements HistoryEvent, SummaryEvent {
   public void fromProto(VertexFinishedProto proto) {
     this.vertexName = proto.getVertexName();
     this.vertexID = TezVertexID.fromString(proto.getVertexId());
-    this.numTasks = proto.getNumTasks();
     this.finishTime = proto.getFinishTime();
     this.state = VertexState.values()[proto.getState()];
     if (proto.hasDiagnostics())  {

http://git-wip-us.apache.org/repos/asf/tez/blob/202ce976/tez-dag/src/main/proto/HistoryEvents.proto
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/proto/HistoryEvents.proto b/tez-dag/src/main/proto/HistoryEvents.proto
index e8f323d..5d18b0a 100644
--- a/tez-dag/src/main/proto/HistoryEvents.proto
+++ b/tez-dag/src/main/proto/HistoryEvents.proto
@@ -136,7 +136,6 @@ message VertexFinishedProto {
   optional int64 finish_time = 3;
   optional int32 state = 4;
   optional string diagnostics = 5;
-  optional int32 num_tasks = 6;
 }
 
 message TaskStartedProto {