Repository: tez
Updated Branches:
refs/heads/branch-0.7 4e93cea68 -> 6675ca087
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/6675ca08
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6675ca08
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6675ca08
Branch: refs/heads/branch-0.7
Commit: 6675ca087f5968b7c5076e88b961d574c660ffb0
Parents: 4e93cea
Author: Bikas Saha <[email protected]>
Authored: Fri Aug 28 13:43:03 2015 -0700
Committer: Bikas Saha <[email protected]>
Committed: Fri Aug 28 13:52:04 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 16 ++++++++++++++++
.../org/apache/tez/dag/app/dag/impl/VertexImpl.java | 6 +++---
.../apache/tez/dag/app/dag/impl/TestVertexImpl.java | 2 ++
3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/6675ca08/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 99850b1..e535512 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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.
@@ -233,6 +235,13 @@ Release 0.6.3: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+<<<<<<< HEAD
+=======
+ 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.
+>>>>>>> e5a79fd... TEZ-2742. VertexImpl.finished() terminationCause hides
member var of the same name (bikas)
TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.
TEZ-2687. ATS History shutdown happens before the min-held containers are
released
TEZ-2629. LimitExceededException in Tez client when DAG has exceeds the
default max counters
@@ -443,6 +452,13 @@ INCOMPATIBLE CHANGES
TEZ-2552. CRC errors can cause job to run for very long time in large jobs.
ALL CHANGES:
+<<<<<<< HEAD
+=======
+ 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.
+>>>>>>> e5a79fd... TEZ-2742. VertexImpl.finished() terminationCause hides
member var of the same name (bikas)
TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.
TEZ-2687. ATS History shutdown happens before the min-held containers are
released
TEZ-2629. LimitExceededException in Tez client when DAG has exceeds the
default max counters
http://git-wip-us.apache.org/repos/asf/tez/blob/6675ca08/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 3714f0b..967962b 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
@@ -2064,10 +2064,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/6675ca08/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 8b2a1b4..18ea970 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
@@ -2936,6 +2936,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)
