You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2016/05/26 18:03:52 UTC

tez git commit: TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. Contributed by Ming Ma. (cherry picked from commit 89802b1c599e34027eedda5d826035cd66b99f85)

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 60b1f6e65 -> ccd272fa9


TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. Contributed by Ming Ma.
(cherry picked from commit 89802b1c599e34027eedda5d826035cd66b99f85)

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

Branch: refs/heads/branch-0.7
Commit: ccd272fa9c93bbaef46d975a558450817e742207
Parents: 60b1f6e
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu May 26 11:01:35 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu May 26 11:03:58 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 .../writers/TestUnorderedPartitionedKVWriter.java       | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ccd272fa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 533383e..8390bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.2 Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter.
   TEZ-3240. Improvements to tez.lib.uris to allow for multiple tarballs and mixing tarballs and jars.
   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.

http://git-wip-us.apache.org/repos/asf/tez/blob/ccd272fa/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 e7a2125..eb9c400 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
@@ -495,12 +495,6 @@ public class TestUnorderedPartitionedKVWriter {
 
     verify(outputContext, never()).fatalError(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());
 
@@ -653,12 +647,6 @@ public class TestUnorderedPartitionedKVWriter {
 
     verify(outputContext, never()).fatalError(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());