svn commit: r946490 - in /hbase/trunk: CHANGES.txt core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

[jg...@apache.org]

Author: jgray
Date: Thu May 20 00:08:56 2010
New Revision: 946490

URL: http://svn.apache.org/viewvc?rev=946490&view=rev
Log:
HBASE-2576  TestHRegion.testDelete_mixed() failing on hudson

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=946490&r1=946489&r2=946490&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu May 20 00:08:56 2010
@@ -343,6 +343,7 @@ Release 0.21.0 - Unreleased
    HBASE-2483  Some tests do not use ephemeral ports
    HBASE-2573  client.HConnectionManager$TableServers logs non-printable
                binary bytes (Benoît Sigoure via Stack)
+   HBASE-2576  TestHRegion.testDelete_mixed() failing on hudson
 
 
   IMPROVEMENTS

Modified: hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=946490&r1=946489&r2=946490&view=diff
==============================================================================
--- hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Thu May 20 00:08:56 2010
@@ -516,7 +516,7 @@ public class TestHRegion extends HBaseTe
     assertEquals("Family " +new String(family)+ " does exist", true, ok);
   }
 
-  public void testDelete_mixed() throws IOException {
+  public void testDelete_mixed() throws IOException, InterruptedException {
     byte [] tableName = Bytes.toBytes("testtable");
     byte [] fam = Bytes.toBytes("info");
     byte [][] families = {fam};
@@ -560,6 +560,9 @@ public class TestHRegion extends HBaseTe
     result = region.get(get, null);
     assertEquals(1, result.size());
 
+    // Sleep to ensure timestamp of next Put is bigger than previous delete
+    Thread.sleep(10);
+    
     // Assert that after a delete, I can put.
     put = new Put(row);
     put.add(fam, splitA, Bytes.toBytes("reference_A"));
@@ -572,11 +575,10 @@ public class TestHRegion extends HBaseTe
     delete = new Delete(row);
     region.delete(delete, null, false);
     assertEquals(0, region.get(get, null).size());
-    try {
-      Thread.sleep(10);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
+    
+    // Sleep to ensure timestamp of next Put is bigger than previous delete
+    Thread.sleep(10);
+    
     region.put(new Put(row).add(fam, splitA, Bytes.toBytes("reference_A")));
     result = region.get(get, null);
     assertEquals(1, result.size());