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) (cherry picked from commit e5a79fd44edbd2376a9c0308a9c9f075cb7d9d25)
Date Fri, 28 Aug 2015 21:03:03 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 92c84a381 -> d05f4671d


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/d05f4671
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d05f4671
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d05f4671

Branch: refs/heads/branch-0.5
Commit: d05f4671df38cae2c2da7bb3a121fac47dbe7ac2
Parents: 92c84a3
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 14:02:42 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/d05f4671/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 98bbef5..2192845 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,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/d05f4671/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 22af12b..50461dd 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
@@ -1812,10 +1812,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/d05f4671/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 ef87d20..06cbe94 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
@@ -2679,6 +2679,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")


Mime
View raw message