Retag 0.92.1RC0 not it has HBASE-5552
git-svn-id: https://svn.apache.org/repos/asf/hbase/tags/0.92.1RC0@1298990 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 9519433..f046a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -72,6 +72,7 @@
HBASE-5537 MXBean shouldn't have a dependence on InterfaceStability until 0.96
HBASE-4890 fix possible NPE in HConnectionManager
HBASE-5529 MR test failures becuase MALLOC_ARENA_MAX is not set (Gregory Chanan)
+ HBASE-5552 Clean up our jmx view; its a bit of a mess
IMPROVEMENTS
diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
index c9b0257..b9fa0dd 100644
--- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
+++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
@@ -36,7 +36,7 @@
@SuppressWarnings({"UnusedDeclaration"})
public HBaseRPCStatistics(MetricsRegistry registry,
String hostName, String port) {
- super(registry, "HBaseRPCStatistics");
+ super(registry, "Metrics for RPC server instance");
String name = String.format("RPCStatistics-%s",
(port != null ? port : "unknown"));
diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 015e901..a47d4a2 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1643,7 +1643,7 @@
@SuppressWarnings("deprecation")
void registerMBean() {
MXBeanImpl mxBeanInfo = MXBeanImpl.init(this);
- MBeanUtil.registerMBean("org.apache.hbase", "Master", mxBeanInfo);
+ MBeanUtil.registerMBean("Master", "Master", mxBeanInfo);
LOG.info("Registered HMaster MXBean");
}
}
diff --git a/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java b/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
index fb65a65..38ed872 100644
--- a/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
+++ b/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
@@ -36,9 +36,11 @@
private final ObjectName mbeanName;
public HBaseInfoMBean(MetricsRegistry registry, String rsName) {
- super(registry, "HBaseInfo");
- mbeanName = MBeanUtil.registerMBean("HBase",
- "Info", this);
+ super(registry, "HBase cluster information");
+ // The name seems wrong to me; should include clusterid IMO.
+ // That would make it harder to locate and rare we have
+ // two clusters up on single machine. St.Ack 20120309
+ mbeanName = MBeanUtil.registerMBean("HBase", "Info", this);
}
public void shutdown() {
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 06ba6f2..ea49006 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -3275,7 +3275,7 @@
@SuppressWarnings("deprecation")
void registerMBean() {
MXBeanImpl mxBeanInfo = MXBeanImpl.init(this);
- mxBean = MBeanUtil.registerMBean("org.apache.hbase", "RegionServer",
+ mxBean = MBeanUtil.registerMBean("RegionServer", "RegionServer",
mxBeanInfo);
LOG.info("Registered RegionServer MXBean");
}
