Skip to content

HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize. #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Reidddddd merged 4 commits into from
Jul 23, 2019
Merged

HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize. #386

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dd5e45
HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize.
murtazahassan123 Jul 15, 2019
f8076a7
HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize. Dep…
murtazahassan123 Jul 18, 2019
5316b19
HBASE-22610 [BucketCache] Rename hbase.offheapcache.minblocksize. Rem…
murtazahassan123 Jul 18, 2019
f1aee3e
HBASE-22610 added two import configs and removed one
murtazahassan123 Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
*/
package org.apache.hadoop.hbase.io.hfile;

import static org.apache.hadoop.hbase.HConstants.BUCKET_CACHE_IOENGINE_KEY;
import static org.apache.hadoop.hbase.HConstants.BUCKET_CACHE_SIZE_KEY;
Copy link
Contributor

@Reidddddd Reidddddd Jul 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this two configs got deleted?

Copy link
Contributor Author

@murtazahassan123 murtazahassan123 Jul 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I accidentally included import static org.apache.hadoop.hbase.HConstants.* and removed the above two ones and didnt notice that. But now it is clean. Thanks.

Copy link
Contributor Author

@murtazahassan123 murtazahassan123 Jul 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please find the latest commit with the changes.


import java.io.IOException;
import java.util.concurrent.ForkJoinPool;

Expand All @@ -33,6 +30,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.hbase.HConstants.*;

@InterfaceAudience.Private
public final class BlockCacheFactory {

Expand Down Expand Up @@ -78,20 +77,38 @@ 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.offheapcache.minblocksize";
public static final String BLOCKCACHE_BLOCKSIZE_KEY = "hbase.blockcache.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;
Expand Down