You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bb...@apache.org on 2022/12/15 17:04:03 UTC
[hbase] 23/91: HubSpot Backport: HBASE-26745 Include Balancer Cost metrics in jmx endpoint
This is an automated email from the ASF dual-hosted git repository.
bbeaudreault pushed a commit to branch hubspot-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit a9f7907f9d0109bdbf2ebbe35f8e5e9aafe8ea37
Author: Briana Augenreich <ba...@hubspot.com>
AuthorDate: Mon Feb 14 10:33:46 2022 -0500
HubSpot Backport: HBASE-26745 Include Balancer Cost metrics in jmx endpoint
---
hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java | 2 +-
.../src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
index 0dbe0fdf78c..def2611b3a5 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
@@ -255,7 +255,7 @@ public class JSONBean {
if ("modelerType".equals(attName)) {
return;
}
- if (attName.indexOf("=") >= 0 || attName.indexOf(":") >= 0 || attName.indexOf(" ") >= 0) {
+ if (attName.indexOf("=") >= 0 || attName.indexOf(" ") >= 0) {
return;
}
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
index 0db6d1232ff..c277cd068da 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
@@ -59,7 +59,7 @@ public class TestJSONBean {
MBeanInfo mbeanInfo = mock(MBeanInfo.class);
when(mbeanInfo.getClassName()).thenReturn("testClassName");
String[] attributeNames = new String[] {"intAttr", "nanAttr", "infinityAttr",
- "strAttr", "boolAttr"};
+ "strAttr", "boolAttr", "test:Attr"};
MBeanAttributeInfo[] attributeInfos = new MBeanAttributeInfo[attributeNames.length];
for (int i = 0; i < attributeInfos.length; i++) {
attributeInfos[i] = new MBeanAttributeInfo(attributeNames[i],
@@ -77,6 +77,7 @@ public class TestJSONBean {
thenReturn(Double.POSITIVE_INFINITY);
when(mbeanServer.getAttribute(any(), eq("strAttr"))).thenReturn("aString");
when(mbeanServer.getAttribute(any(), eq("boolAttr"))).thenReturn(true);
+ when(mbeanServer.getAttribute(any(), eq("test:Attr"))).thenReturn("aString");
return mbeanServer;
}
@@ -92,7 +93,8 @@ public class TestJSONBean {
pw.println(" \"nanAttr\": \"NaN\",");
pw.println(" \"infinityAttr\": \"Infinity\",");
pw.println(" \"strAttr\": \"aString\",");
- pw.println(" \"boolAttr\": true");
+ pw.println(" \"boolAttr\": true,");
+ pw.println(" \"test:Attr\": aString");
pw.println(" }");
pw.println(" ]");
pw.print("}");