hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/0.98 7ca58503b -> 02badbdf9


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/02badbdf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/02badbdf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/02badbdf

Branch: refs/heads/0.98
Commit: 02badbdf9d069f515d3198c799d5575539bd0459
Parents: 7ca5850
Author: Ashish Singhi 
Authored: Wed Aug 24 19:07:47 2016 +0530
Committer: Ashish Singhi 
Committed: Wed Aug 24 19:07:47 2016 +0530

--
 .../ipc/MetricsHBaseServerSourceFactory.java|  4 +--
 .../apache/hadoop/hbase/ipc/TestRpcMetrics.java | 26 
 2 files changed, 28 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/02badbdf/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..66c477b 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.startsWith("HMaster")) {
   return "Master";
-} else if (serverName.contains("HRegion")) {
+} else if (serverName.startsWith("HRegion")) {
   return "RegionServer";
 }
 return "IPC";

http://git-wip-us.apache.org/repos/asf/hbase/blob/02badbdf/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 e81f47a..6f3f732 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
@@ -136,5 +136,31 @@ public class TestRpcMetrics {
 HELPER.assertCounter("exceptions", 5, serverSource);
   }
 
+  @Test
+  public void testServerContextNameWithHostName() {
+String[] masterServerNames =
+{ "HMaster/node-xyz/10.19.250.253:16020", 
"HMaster/node-HRegion-xyz/10.19.250.253:16020" };
+
+String[] regionServerNames = { 
"HRegionserver/node-xyz/10.19.250.253:16020",
+"HRegionserver/node-HMaster1-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("IPC", 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("IPC", rsSource.getMetricsName());
+}
+  }
 }

hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
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());
+}
+  }
 }

hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 46f3f5bf7 -> 4dcd7fb6d


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/4dcd7fb6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4dcd7fb6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4dcd7fb6

Branch: refs/heads/branch-1.2
Commit: 4dcd7fb6d1ea670073ce80bad0dd6a372b5836f1
Parents: 46f3f5b
Author: Ashish Singhi 
Authored: Wed Aug 24 18:59:44 2016 +0530
Committer: Ashish Singhi 
Committed: Wed Aug 24 19:04:28 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/4dcd7fb6/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/4dcd7fb6/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 52518f8..2b8bdd7 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
@@ -137,5 +137,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());
+}
+  }
 }

hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 dae97549e -> 6b9a0b3b0


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/6b9a0b3b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6b9a0b3b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6b9a0b3b

Branch: refs/heads/branch-1.3
Commit: 6b9a0b3b0259c360e33d6171e26898b166ad8863
Parents: dae9754
Author: Ashish Singhi 
Authored: Wed Aug 24 18:59:44 2016 +0530
Committer: Ashish Singhi 
Committed: Wed Aug 24 19:03:27 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/6b9a0b3b/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/6b9a0b3b/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 52518f8..2b8bdd7 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
@@ -137,5 +137,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());
+}
+  }
 }

hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 c64c0e85c -> 3606b890f


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/3606b890
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3606b890
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3606b890

Branch: refs/heads/branch-1
Commit: 3606b890f86a826462e42da62e6244515a1710c9
Parents: c64c0e8
Author: Ashish Singhi 
Authored: Wed Aug 24 18:59:44 2016 +0530
Committer: Ashish Singhi 
Committed: Wed Aug 24 19:01:58 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/3606b890/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/3606b890/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 52518f8..2b8bdd7 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
@@ -137,5 +137,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());
+}
+  }
 }

hbase git commit: HBASE-16471 Region Server metrics context will be wrong when machine hostname contain "master" word (Pankaj Kumar)

2016-08-24 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/master 1ca849269 -> 31f16d6ae


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/31f16d6a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31f16d6a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31f16d6a

Branch: refs/heads/master
Commit: 31f16d6aec7d09f0a4102ed7651db9ff0d190cf9
Parents: 1ca8492
Author: Ashish Singhi 
Authored: Wed Aug 24 18:59:44 2016 +0530
Committer: Ashish Singhi 
Committed: Wed Aug 24 18:59:44 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/31f16d6a/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/31f16d6a/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 9f1b63a..4de618f 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
@@ -138,5 +138,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());
+}
+  }
 }