[hbase] branch branch-2 updated: HBASE-25135 Convert the internal seperator while emitting the memstore read metrics to # (#2486) (#2489)

[ra...@apache.org]

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

ramkrishna 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 11cbca1  HBASE-25135 Convert the internal seperator while emitting the memstore read metrics to # (#2486) (#2489)
11cbca1 is described below

commit 11cbca1a5e1ff60e8a48e89f06517a4b924e4dd9
Author: ramkrish86 <ra...@hotmail.com>
AuthorDate: Thu Oct 1 18:18:31 2020 +0530

    HBASE-25135 Convert the internal seperator while emitting the memstore read metrics to # (#2486) (#2489)
    
    Signed-off-by: Anoop Sam John <an...@apache.org>
---
 .../hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java       | 2 +-
 .../org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java  | 2 +-
 .../org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java | 4 ++--
 .../hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java
index 1db3c00..e8eae0d 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java
@@ -28,7 +28,7 @@ import org.apache.yetus.audience.InterfaceAudience;
  */
 @InterfaceAudience.Private
 public interface MetricsTableWrapperAggregate {
-  public String UNDERSCORE = "_";
+  public String HASH = "#";
   /**
    * Get the number of read requests that have been issued against this table
    */
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
index 84fc86e..d82cc53 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
@@ -334,7 +334,7 @@ public class MetricsTableSourceImpl implements MetricsTableSource {
       for (Entry<String, Long> entry : metricMap.entrySet()) {
         // append 'store' and its name to the metric
         mrb.addGauge(Interns.info(this.tableNamePrefixPart1 + _COLUMNFAMILY
-            + entry.getKey().split(MetricsTableWrapperAggregate.UNDERSCORE)[1]
+            + entry.getKey().split(MetricsTableWrapperAggregate.HASH)[1]
             + this.tableNamePrefixPart2 + metricName,
           metricDesc), entry.getValue());
       }
diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java
index b810a13..56199f4 100644
--- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java
+++ b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java
@@ -111,14 +111,14 @@ public class MetricsTableWrapperStub implements MetricsTableWrapperAggregate {
   @Override
   public Map<String, Long> getMemstoreOnlyRowReadsCount(String table) {
     Map<String, Long> map = new HashMap<String, Long>();
-    map.put("table_info", 3L);
+    map.put("table#info", 3L);
     return map;
   }
 
   @Override
   public Map<String, Long> getMixedRowReadsCount(String table) {
     Map<String, Long> map = new HashMap<String, Long>();
-    map.put("table_info", 3L);
+    map.put("table#info", 3L);
     return map;
   }
 }
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java
index 142d2cc..c206c59 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java
@@ -94,7 +94,7 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
                   (long) store.getAvgStoreFileAge().getAsDouble() * store.getStorefilesCount();
             }
             mt.storeCount += 1;
-            tempKey = tbl.getNameAsString() + UNDERSCORE + familyName;
+            tempKey = tbl.getNameAsString() + HASH + familyName;
             Long tempVal = mt.perStoreMemstoreOnlyReadCount.get(tempKey);
             if (tempVal == null) {
               tempVal = 0L;