Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B2154200B6F for ; Wed, 24 Aug 2016 15:35:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0867160AB1; Wed, 24 Aug 2016 13:35:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 039FD160AA4 for ; Wed, 24 Aug 2016 15:35:42 +0200 (CEST) Received: (qmail 12270 invoked by uid 500); 24 Aug 2016 13:35:42 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 12261 invoked by uid 99); 24 Aug 2016 13:35:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2016 13:35:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8999E020A; Wed, 24 Aug 2016 13:35:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashishsinghi@apache.org To: commits@hbase.apache.org Message-Id: <52d20c83076c411bb37c638de3cba9a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar) Date: Wed, 24 Aug 2016 13:35:41 +0000 (UTC) archived-at: Wed, 24 Aug 2016 13:35:43 -0000 Repository: hbase Updated Branches: refs/heads/branch-1.1 ecedea0b0 -> 43c93d4c6 HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/43c93d4c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/43c93d4c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/43c93d4c Branch: refs/heads/branch-1.1 Commit: 43c93d4c69a490723f176c1e1e4aed181cc6ef85 Parents: ecedea0 Author: Ashish Singhi Authored: Wed Aug 24 18:59:44 2016 +0530 Committer: Ashish Singhi Committed: Wed Aug 24 19:05:18 2016 +0530 ---------------------------------------------------------------------- .../ipc/MetricsHBaseServerSourceFactory.java | 4 +-- .../apache/hadoop/hbase/ipc/TestRpcMetrics.java | 29 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/43c93d4c/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 d6b1392..e9a3348 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") || serverName.contains("master")) { + if (serverName.startsWith("HMaster") || serverName.startsWith("master")) { return "Master"; - } else if (serverName.contains("HRegion") || serverName.contains("regionserver")) { + } else if (serverName.startsWith("HRegion") || serverName.startsWith("regionserver")) { return "RegionServer"; } return "IPC"; http://git-wip-us.apache.org/repos/asf/hbase/blob/43c93d4c/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 e33a0d7..dd8f226 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 @@ -132,5 +132,34 @@ public class TestRpcMetrics { HELPER.assertCounter("exceptions", 5, serverSource); } + @Test + public void testServerContextNameWithHostName() { + String[] masterServerNames = { "master/node-xyz/10.19.250.253:16020", + "master/node-regionserver-xyz/10.19.250.253:16020", "HMaster/node-xyz/10.19.250.253:16020", + "HMaster/node-regionserver-xyz/10.19.250.253:16020" }; + + String[] regionServerNames = { "regionserver/node-xyz/10.19.250.253:16020", + "regionserver/node-master1-xyz/10.19.250.253:16020", + "HRegionserver/node-xyz/10.19.250.253:16020", + "HRegionserver/node-master1-xyz/10.19.250.253:16020" }; + + MetricsHBaseServerSource masterSource = null; + for (String serverName : masterServerNames) { + masterSource = new MetricsHBaseServer(serverName, new MetricsHBaseServerWrapperStub()) + .getMetricsSource(); + assertEquals("master", masterSource.getMetricsContext()); + assertEquals("Master,sub=IPC", masterSource.getMetricsJmxContext()); + assertEquals("Master", masterSource.getMetricsName()); + } + + MetricsHBaseServerSource rsSource = null; + for (String serverName : regionServerNames) { + rsSource = new MetricsHBaseServer(serverName, new MetricsHBaseServerWrapperStub()) + .getMetricsSource(); + assertEquals("regionserver", rsSource.getMetricsContext()); + assertEquals("RegionServer,sub=IPC", rsSource.getMetricsJmxContext()); + assertEquals("RegionServer", rsSource.getMetricsName()); + } + } }