tez git commit: TEZ-2742. VertexImpl.finished() terminationCause hides member var of the same name (bikas) (cherry picked from commit e5a79fd44edbd2376a9c0308a9c9f075cb7d9d25)

[bikas]

Repository: tez
Updated Branches:
  refs/heads/branch-0.6 253e8dee4 -> 740ed2d13


TEZ-2742. VertexImpl.finished() terminationCause hides member var of the same 
name (bikas)
(cherry picked from commit e5a79fd44edbd2376a9c0308a9c9f075cb7d9d25)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.6
Commit: 740ed2d132ea4796e5d0af7121f30ab83c91d0d9
Parents: 253e8de
Author: Bikas Saha <bi...@apache.org>
Authored: Fri Aug 28 13:43:03 2015 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Fri Aug 28 13:59:59 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 4 ++++
 .../main/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, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/740ed2d1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b9b9694..2920998 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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
@@ -228,6 +230,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/740ed2d1/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 463da8b..5a451e8 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
@@ -1848,10 +1848,10 @@ public class VertexImpl implements 
org.apache.tez.dag.app.dag.Vertex,
   }
 
   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/740ed2d1/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 a8d8ba5..571b499 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
@@ -2697,6 +2697,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)));
   }
 
   @SuppressWarnings("unchecked")