From 57826c7da9a4ed372e0c1c46c36b9bbd043e90e9 Mon Sep 17 00:00:00 2001
From: Jimmy Xiang <jxiang@cloudera.com>
Date: Mon, 2 Jun 2014 12:24:48 -0700
Subject: [PATCH] HBASE-11237 Bulk load initiated by user other than hbase
 fails

---
 .../java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java   | 5 +++--
 .../java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java  | 1 +
 .../hbase/io/hfile/TestScannerSelectionUsingKeyRange.java    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
index 741c9e28981..85e1e9ff706 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
@@ -423,7 +423,8 @@ public class CacheConfig {
   static BlockCache GLOBAL_BLOCK_CACHE_INSTANCE;
 
   /** Boolean whether we have disabled the block cache entirely. */
-  private static boolean blockCacheDisabled = false;
+  @VisibleForTesting
+  static boolean blockCacheDisabled = false;
 
   /**
    * Returns the block cache or <code>null</code> in case none should be used.
@@ -437,7 +438,7 @@ public class CacheConfig {
 
     float cachePercentage = conf.getFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY,
       HConstants.HFILE_BLOCK_CACHE_SIZE_DEFAULT);
-    if (cachePercentage == 0L) {
+    if (cachePercentage <= 0.0001f) {
       blockCacheDisabled = true;
       return null;
     }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
index 52aabf6a695..6e0a2ca70bb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
@@ -57,6 +57,7 @@ public class TestPrefetch {
     conf.setInt(HFile.FORMAT_VERSION_KEY, 3);
     conf.setBoolean(CacheConfig.PREFETCH_BLOCKS_ON_OPEN_KEY, true);
     fs = HFileSystem.get(conf);
+    CacheConfig.blockCacheDisabled = false;
     cacheConf = new CacheConfig(conf);
   }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java
index 65aaf477739..4eb4fd12566 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java
@@ -53,7 +53,7 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 @Category(SmallTests.class)
 public class TestScannerSelectionUsingKeyRange {
-  private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility().createLocalHTU();
+  private static final HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU();
   private static TableName TABLE = TableName.valueOf("myTable");
   private static String FAMILY = "myCF";
   private static byte[] FAMILY_BYTES = Bytes.toBytes(FAMILY);
@@ -113,6 +113,7 @@ public class TestScannerSelectionUsingKeyRange {
     }
 
     Scan scan = new Scan(Bytes.toBytes("aaa"), Bytes.toBytes("aaz"));
+    CacheConfig.blockCacheDisabled = false;
     CacheConfig cacheConf = new CacheConfig(conf);
     LruBlockCache cache = (LruBlockCache) cacheConf.getBlockCache();
     cache.clearCache();