Repository: tez Updated Branches: refs/heads/master 2ecef2527 -> 89802b1c5
TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. Contributed by Ming Ma. Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/89802b1c Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/89802b1c Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/89802b1c Branch: refs/heads/master Commit: 89802b1c599e34027eedda5d826035cd66b99f85 Parents: 2ecef25 Author: Siddharth Seth <[email protected]> Authored: Thu May 26 11:01:35 2016 -0700 Committer: Siddharth Seth <[email protected]> Committed: Thu May 26 11:01:35 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../writers/TestUnorderedPartitionedKVWriter.java | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/89802b1c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c3499ac..07052e5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. TEZ-3206. Have unordered partitioned KV output send partition stats via VertexManagerEvent. TEZ-3237. Corrupted shuffle transfers to disk are not detected during transfer TEZ-3240. Improvements to tez.lib.uris to allow for multiple tarballs and mixing tarballs and jars. @@ -45,6 +46,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. TEZ-3237. Corrupted shuffle transfers to disk are not detected during transfer TEZ-3246. Improve diagnostics when DAG killed by user TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC options. @@ -488,6 +490,8 @@ Release 0.7.2: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + + TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. TEZ-3237. Corrupted shuffle transfers to disk are not detected during transfer TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC options. TEZ-3256. [Backport HADOOP-11032] Remove Guava Stopwatch dependency http://git-wip-us.apache.org/repos/asf/tez/blob/89802b1c/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java index 3b82690..9d2b615 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java @@ -560,12 +560,6 @@ public class TestUnorderedPartitionedKVWriter { verify(outputContext, never()).reportFailure(any(TaskFailureType.class), any(Throwable.class), any(String.class)); - // Verify the status of the buffers - if (numExpectedSpills == 0) { - assertEquals(1, kvWriter.numInitializedBuffers); - } else { - assertTrue(kvWriter.numInitializedBuffers > 1); - } assertNull(kvWriter.currentBuffer); assertEquals(0, kvWriter.availableBuffers.size()); @@ -729,12 +723,6 @@ public class TestUnorderedPartitionedKVWriter { verify(outputContext, never()).reportFailure(any(TaskFailureType.class), any(Throwable.class), any(String.class)); - // Verify the status of the buffers - if (numExpectedSpills == 0) { - assertEquals(1, kvWriter.numInitializedBuffers); - } else { - assertTrue(kvWriter.numInitializedBuffers > 1); - } assertNull(kvWriter.currentBuffer); assertEquals(0, kvWriter.availableBuffers.size());
