diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java index cb02c04e9e3f..2c92d9238dcc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java @@ -69,14 +69,18 @@ private DataTieringManager(Map onlineRegions) { */ public static synchronized boolean instantiate(Configuration conf, Map onlineRegions) { - if (isDataTieringFeatureEnabled(conf) && instance == null) { - instance = new DataTieringManager(onlineRegions); - LOG.info("DataTieringManager instantiated successfully."); - return true; - } else { + if (!isDataTieringFeatureEnabled(conf)) { + LOG.debug("DataTiering feature is disabled (key: {}). Skipping instantiation.", + GLOBAL_DATA_TIERING_ENABLED_KEY); + return false; + } + if (instance != null) { LOG.warn("DataTieringManager is already instantiated."); + return false; } - return false; + instance = new DataTieringManager(onlineRegions); + LOG.info("DataTieringManager instantiated successfully."); + return true; } /**