You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/10/24 06:49:55 UTC
git commit: HBASE-12328 Need to separate JvmMetrics for Master and
RegionServer (Sanghyun Yun)
Repository: hbase
Updated Branches:
refs/heads/master b389ca211 -> 31c185aad
HBASE-12328 Need to separate JvmMetrics for Master and RegionServer (Sanghyun Yun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/31c185aa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31c185aa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31c185aa
Branch: refs/heads/master
Commit: 31c185aad5a4e17e7faecfba4b11ef3ce12f10f4
Parents: b389ca2
Author: stack <st...@apache.org>
Authored: Thu Oct 23 21:49:47 2014 -0700
Committer: stack <st...@apache.org>
Committed: Thu Oct 23 21:49:47 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java | 4 ++--
.../hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java | 2 +-
.../test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/31c185aa/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java
index 4ad9f33..d6b1392 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java
@@ -47,9 +47,9 @@ public abstract class MetricsHBaseServerSourceFactory {
* @return The Camel Cased context name.
*/
protected static String createContextName(String serverName) {
- if (serverName.contains("HMaster")) {
+ if (serverName.contains("HMaster") || serverName.contains("master")) {
return "Master";
- } else if (serverName.contains("HRegion")) {
+ } else if (serverName.contains("HRegion") || serverName.contains("regionserver")) {
return "RegionServer";
}
return "IPC";
http://git-wip-us.apache.org/repos/asf/hbase/blob/31c185aa/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java
index df40e68..cca53e0 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java
@@ -46,7 +46,7 @@ public class MetricsHBaseServerSourceFactoryImpl extends MetricsHBaseServerSourc
if (source == null) {
//Create the source.
source = new MetricsHBaseServerSourceImpl(
- METRICS_NAME,
+ context,
METRICS_DESCRIPTION,
context.toLowerCase(),
context + METRICS_JMX_CONTEXT_SUFFIX, wrapper);
http://git-wip-us.apache.org/repos/asf/hbase/blob/31c185aa/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java
index af764f4..443ec78 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java
@@ -48,8 +48,8 @@ public class TestRpcMetrics {
assertEquals("Master,sub=IPC", masterSource.getMetricsJmxContext());
assertEquals("RegionServer,sub=IPC", rsSource.getMetricsJmxContext());
- assertEquals("IPC", masterSource.getMetricsName());
- assertEquals("IPC", rsSource.getMetricsName());
+ assertEquals("Master", masterSource.getMetricsName());
+ assertEquals("RegionServer", rsSource.getMetricsName());
}
/**