[hbase] branch branch-2 updated: Revert "HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize"

[reidchan]

This is an automated email from the ASF dual-hosted git repository.

reidchan pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new be5e3de  Revert "HBASE-22610 [BucketCache] Rename 
hbase.offheapcache.minblocksize"
be5e3de is described below

commit be5e3de8afb277733f57d18d5d13e08241e0e888
Author: Reid Chan <reidc...@apache.org>
AuthorDate: Tue Jul 23 11:04:13 2019 +0800

    Revert "HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize"
    
    Reason: Deprecated a wrong parameter.
    
    This reverts commit e95bdf415cea2190083150e3f8f6cea8995550d6.
---
 .../hadoop/hbase/io/hfile/BlockCacheFactory.java   | 24 +++-------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
index 4ee4977..4d62992 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
@@ -78,38 +78,20 @@ public final class BlockCacheFactory {
   /**
    * The target block size used by blockcache instances. Defaults to
    * {@link HConstants#DEFAULT_BLOCKSIZE}.
+   * TODO: this config point is completely wrong, as it's used to determine the
+   * target block size of BlockCache instances. Rename.
    */
-  public static final String BLOCKCACHE_BLOCKSIZE_KEY = 
"hbase.blockcache.minblocksize";
+  public static final String BLOCKCACHE_BLOCKSIZE_KEY = 
"hbase.offheapcache.minblocksize";
 
   private static final String EXTERNAL_BLOCKCACHE_KEY = 
"hbase.blockcache.use.external";
   private static final boolean EXTERNAL_BLOCKCACHE_DEFAULT = false;
 
   private static final String EXTERNAL_BLOCKCACHE_CLASS_KEY = 
"hbase.blockcache.external.class";
 
-  /**
-   * @deprecated use {@link BlockCacheFactory#BLOCKCACHE_BLOCKSIZE_KEY} 
instead.
-   */
-  @Deprecated
-  static final String DEPRECATED_BLOCKCACHE_BLOCKSIZE_KEY = 
"hbase.blockcache.minblocksize";
-
-  /**
-   * The config point hbase.offheapcache.minblocksize is completely wrong, 
which is replaced by
-   * {@link BlockCacheFactory#BLOCKCACHE_BLOCKSIZE_KEY}. Keep the old config 
key here for backward
-   * compatibility.
-   */
-  static {
-    Configuration.addDeprecation(DEPRECATED_BLOCKCACHE_BLOCKSIZE_KEY, 
BLOCKCACHE_BLOCKSIZE_KEY);
-  }
-
   private BlockCacheFactory() {
   }
 
   public static BlockCache createBlockCache(Configuration conf) {
-    if (conf.get(DEPRECATED_BLOCKCACHE_BLOCKSIZE_KEY) != null) {
-      LOG.warn("The config key {} is deprecated now, instead please use {}. In 
future release "
-            + "we will remove the deprecated config.", 
DEPRECATED_BLOCKCACHE_BLOCKSIZE_KEY,
-        BLOCKCACHE_BLOCKSIZE_KEY);
-    }
     FirstLevelBlockCache l1Cache = createFirstLevelCache(conf);
     if (l1Cache == null) {
       return null;