svn commit: r1381999 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

[mb...@apache.org]

Author: mbautin
Date: Fri Sep  7 12:50:13 2012
New Revision: 1381999

URL: http://svn.apache.org/viewvc?rev=1381999&view=rev
Log:
[HBASE-5898] Fix TestFromClientSide#testCacheOnWriteEvictOnClose

Author: michalgr

Summary: Because of double-checked locking we miss twice when block is not present in cache. Test expects only one miss.

Test Plan: mvn -Dtest=TestFromClientSide#testCacheOnWriteEvictOnClose test

Reviewers: liyintang, kannan

Reviewed By: kannan

CC: Karthik, gqchen, aaiyer, mbautin

Differential Revision: https://reviews.facebook.net/D4977

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1381999&r1=1381998&r2=1381999&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java Fri Sep  7 12:50:13 2012
@@ -4235,7 +4235,8 @@ public class TestFromClientSide {
     expectedBlockCount += 1; // cached one data block
     assertEquals(expectedBlockCount, cache.getBlockCount());
     assertEquals(expectedBlockHits, cache.getStats().getHitCount());
-    assertEquals(++expectedBlockMiss, cache.getStats().getMissCount());
+    expectedBlockMiss += 2; // Dobule checked locking
+    assertEquals(expectedBlockMiss, cache.getStats().getMissCount());
   }
 
   private void waitForStoreFileCount(Store store, int count, int timeout)