Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12328 Need to separate JvmMetrics for Master and RegionServer (Sanghyun Yun)

This commit is contained in:
stack 2014-10-23 21:49:47 -07:00
parent b389ca211e
commit 31c185aad5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java
View File

@ -47,9 +47,9 @@ public abstract class MetricsHBaseServerSourceFactory {
* @return The Camel Cased context name. * @return The Camel Cased context name.
*/ */
protected static String createContextName(String serverName) { protected static String createContextName(String serverName) {
if (serverName.contains("HMaster")) { if (serverName.contains("HMaster") || serverName.contains("master")) {
return "Master"; return "Master";
} else if (serverName.contains("HRegion")) { } else if (serverName.contains("HRegion") || serverName.contains("regionserver")) {
return "RegionServer"; return "RegionServer";
} }
return "IPC"; return "IPC";

2
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java
View File

@ -46,7 +46,7 @@ public class MetricsHBaseServerSourceFactoryImpl extends MetricsHBaseServerSourc
if (source == null) { if (source == null) {
//Create the source. //Create the source.
source = new MetricsHBaseServerSourceImpl( source = new MetricsHBaseServerSourceImpl(
METRICS_NAME, context,
METRICS_DESCRIPTION, METRICS_DESCRIPTION,
context.toLowerCase(), context.toLowerCase(),
context + METRICS_JMX_CONTEXT_SUFFIX, wrapper); context + METRICS_JMX_CONTEXT_SUFFIX, wrapper);

4
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java
View File

@ -48,8 +48,8 @@ public class TestRpcMetrics {
assertEquals("Master,sub=IPC", masterSource.getMetricsJmxContext()); assertEquals("Master,sub=IPC", masterSource.getMetricsJmxContext());
assertEquals("RegionServer,sub=IPC", rsSource.getMetricsJmxContext()); assertEquals("RegionServer,sub=IPC", rsSource.getMetricsJmxContext());
assertEquals("IPC", masterSource.getMetricsName()); assertEquals("Master", masterSource.getMetricsName());
assertEquals("IPC", rsSource.getMetricsName()); assertEquals("RegionServer", rsSource.getMetricsName());
} }
/** /**