[hbase] branch branch-2.1 updated: HBASE-23094 Wrong log message in simpleRegionNormaliser while checking if merge is enabled.

[ps...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 1c56d3e  HBASE-23094 Wrong log message in simpleRegionNormaliser while checking if merge is enabled.
1c56d3e is described below

commit 1c56d3ee9220f80a017e08721c2215702f1400c6
Author: Sanjeet Nishad <sa...@gmail.com>
AuthorDate: Mon Oct 7 12:09:14 2019 +0530

    HBASE-23094 Wrong log message in simpleRegionNormaliser while checking if merge is enabled.
    
    Signed-off-by: Peter Somogyi <ps...@apache.org>
---
 .../apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
index 74b338b..435f1ca 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
@@ -131,7 +131,7 @@ public class SimpleRegionNormalizer implements RegionNormalizer {
       mergeEnabled = masterRpcServices.isSplitOrMergeEnabled(null,
         RequestConverter.buildIsSplitOrMergeEnabledRequest(MasterSwitchType.MERGE)).getEnabled();
     } catch (org.apache.hbase.thirdparty.com.google.protobuf.ServiceException e) {
-      LOG.debug("Unable to determine whether split is enabled", e);
+      LOG.debug("Unable to determine whether merge is enabled", e);
     }
     if (!mergeEnabled && !splitEnabled) {
       LOG.debug("Both split and merge are disabled for table: " + table);