You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2014/11/17 20:22:56 UTC

[47/50] [abbrv] tez git commit: TEZ-1772. Failing tests post TEZ-1737. (Jeff Zhang via hitesh)

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


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

Branch: refs/heads/TEZ-8
Commit: 1a3059f41820ce91acc9eeb3b8c30fb4b53ea2b5
Parents: f4c2112
Author: Hitesh Shah <hi...@apache.org>
Authored: Thu Nov 13 14:12:51 2014 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Thu Nov 13 14:12:51 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 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/1a3059f4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f0417e..0f66807 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@ 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/1a3059f4/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 d1d7eef..d6e0b79 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,6 +98,7 @@ 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) {
@@ -109,6 +110,7 @@ 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/1a3059f4/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 5d18b0a..e8f323d 100644
--- a/tez-dag/src/main/proto/HistoryEvents.proto
+++ b/tez-dag/src/main/proto/HistoryEvents.proto
@@ -136,6 +136,7 @@ message VertexFinishedProto {
   optional int64 finish_time = 3;
   optional int32 state = 4;
   optional string diagnostics = 5;
+  optional int32 num_tasks = 6;
 }
 
 message TaskStartedProto {