tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject tez git commit: TEZ-2742. VertexImpl.finished() terminationCause hides member var of the same name (bikas)
Date Fri, 28 Aug 2015 20:43:27 GMT
Repository: tez
Updated Branches:
  refs/heads/master 6e02509bb -> e5a79fd44


TEZ-2742. VertexImpl.finished() terminationCause hides member var of the same name (bikas)


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

Branch: refs/heads/master
Commit: e5a79fd44edbd2376a9c0308a9c9f075cb7d9d25
Parents: 6e02509
Author: Bikas Saha <bikas@apache.org>
Authored: Fri Aug 28 13:43:03 2015 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Fri Aug 28 13:43:03 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                  | 8 ++++++++
 .../java/org/apache/tez/dag/app/dag/impl/VertexImpl.java     | 6 +++---
 .../java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java | 2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/e5a79fd4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 28dd3a5..e145916 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ Release 0.8.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2742. VertexImpl.finished() terminationCause hides member var of the
+  same name
   TEZ-2747. Update master to reflect 0.8.0-alpha release.
   TEZ-2662. Provide a way to check whether AM or task opts are valid and error if not.
 
@@ -151,6 +153,8 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2742. VertexImpl.finished() terminationCause hides member var of the
+  same name
   TEZ-2662. Provide a way to check whether AM or task opts are valid and error if not.
   TEZ-2300. TezClient.stop() takes a lot of time or does not work sometimes
   TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.
@@ -378,6 +382,8 @@ Release 0.6.3: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2742. VertexImpl.finished() terminationCause hides member var of the
+  same name
   TEZ-2732. DefaultSorter throws ArrayIndex exceptions on 2047 Mb size sort buffers
   TEZ-2290. Scale memory for Default Sorter down to a max of 2047 MB if configured higher.
   TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.
@@ -590,6 +596,8 @@ INCOMPATIBLE CHANGES
   TEZ-2552. CRC errors can cause job to run for very long time in large jobs.
 
 ALL CHANGES:
+  TEZ-2742. VertexImpl.finished() terminationCause hides member var of the
+  same name
   TEZ-2732. DefaultSorter throws ArrayIndex exceptions on 2047 Mb size sort buffers
   TEZ-2290. Scale memory for Default Sorter down to a max of 2047 MB if configured higher.
   TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.

http://git-wip-us.apache.org/repos/asf/tez/blob/e5a79fd4/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index a1dcf6c..f4dd7dc 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -2169,10 +2169,10 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
EventHandl
   }
 
   VertexState finished(VertexState finalState,
-      VertexTerminationCause terminationCause, String diag) {
+      VertexTerminationCause termCause, String diag) {
     if (finishTime == 0) setFinishTime();
-    if (terminationCause != null) {
-      trySetTerminationCause(terminationCause);
+    if (termCause != null) {
+      trySetTerminationCause(termCause);
     }
     if (rootInputInitializerManager != null) {
       rootInputInitializerManager.shutdown();

http://git-wip-us.apache.org/repos/asf/tez/blob/e5a79fd4/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
index a8ba445..eb68a6f 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
@@ -3085,6 +3085,8 @@ public class TestVertexImpl {
         StringUtils.join(v3.getDiagnostics(), ",").toLowerCase(Locale.ENGLISH);
     assertTrue(diagnostics.contains(
         "vertex received kill while in running state"));
+    Assert.assertEquals(VertexTerminationCause.DAG_KILL, v3.getTerminationCause());
+    assertTrue(diagnostics.contains(v3.getTerminationCause().name().toLowerCase(Locale.ENGLISH)));
   }
 
   @Test(timeout = 5000)


Mime
View raw message