svn commit: r1343921 - in /hbase/branches/0.92: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

[st...@apache.org]

Author: stack
Date: Tue May 29 19:00:02 2012
New Revision: 1343921

URL: http://svn.apache.org/viewvc?rev=1343921&view=rev
Log:
HBASE-6097 TestHRegion.testBatchPut is flaky on 0.92

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1343921&r1=1343920&r2=1343921&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Tue May 29 19:00:02 2012
@@ -91,6 +91,7 @@ Release 0.92.2 - Unreleased
    HBASE-6023  Normalize security audit logging level with Hadoop
    HBASE-6013  Polish sharp edges from CopyTable
    HBASE-6077  Document the most common secure RPC troubleshooting resolutions
+   HBASE-6097  TestHRegion.testBatchPut is flaky on 0.92 (Gregory Chanan)
 
   NEW FEATURE
    HBASE-5128  [uber hbck] Online automated repair of table integrity and region consistency problems

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1343921&r1=1343920&r2=1343921&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Tue May 29 19:00:02 2012
@@ -560,7 +560,11 @@ public class TestHRegion extends HBaseTe
     byte[] cf = Bytes.toBytes("cf");
     byte[] qual = Bytes.toBytes("qual");
     byte[] val = Bytes.toBytes("val");
-    this.region = initHRegion(b, getName(), cf);
+    Configuration conf = HBaseConfiguration.create();
+    // Set optionallogflushinterval to a high value so that it doesn't flush during this test
+    // and throw off the calculation of number of syncs.  See HBASE-6097.
+    conf.setLong("hbase.regionserver.optionallogflushinterval",Integer.MAX_VALUE);
+    this.region = initHRegion(b, getName(), conf, cf);
     try {
       HLog.getSyncOps(); // clear counter from prior tests
       assertEquals(0, HLog.getSyncOps());