From e1d16e9892772976cb25d811e229dbbf9125aea8 Mon Sep 17 00:00:00 2001
From: liangxie <liangxie@unknown>
Date: Tue, 13 May 2014 05:06:14 +0000
Subject: [PATCH] Amend HBASE-10561 Forward port: HBASE-10212 New rpc metric:
 number of active handler

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1594126 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java | 2 ++
 .../apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java | 4 +++-
 .../java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java  | 2 +-
 .../hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java       | 2 +-
 .../test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
index 81ad44ae39f..25f0c407002 100644
--- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
+++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
@@ -53,6 +53,8 @@ public interface MetricsHBaseServerSource extends BaseSource {
   String PRIORITY_QUEUE_DESC = "Number of calls in the priority call queue.";
   String NUM_OPEN_CONNECTIONS_NAME = "numOpenConnections";
   String NUM_OPEN_CONNECTIONS_DESC = "Number of open connections.";
+  String NUM_ACTIVE_HANDLER_NAME = "numActiveHandler";
+  String NUM_ACTIVE_HANDLER_DESC = "Number of active rpc handlers.";
 
   void authorizationSuccess();
 
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
index 565a5707d29..ebe04f3d530 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
@@ -122,7 +122,9 @@ public class MetricsHBaseServerSourceImpl extends BaseSourceImpl
           .addGauge(Interns.info(PRIORITY_QUEUE_NAME, PRIORITY_QUEUE_DESC),
               wrapper.getPriorityQueueLength())
           .addGauge(Interns.info(NUM_OPEN_CONNECTIONS_NAME,
-              NUM_OPEN_CONNECTIONS_DESC), wrapper.getNumOpenConnections());
+              NUM_OPEN_CONNECTIONS_DESC), wrapper.getNumOpenConnections())
+          .addGauge(Interns.info(NUM_ACTIVE_HANDLER_NAME,
+              NUM_ACTIVE_HANDLER_DESC), wrapper.getActiveRpcHandlerCount());
     }
 
     metricsRegistry.snapshot(mrb, all);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
index 671f3d53add..764900b670d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java
@@ -207,7 +207,7 @@ public class SimpleRpcScheduler implements RpcScheduler {
 
   @Override
   public int getActiveRpcHandlerCount() {
-    return 0;
+    return activeHandlerCount.get();
   }
 
   private void consumerLoop(BlockingQueue<CallRunner> myQueue) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java
index c3ead834646..6241f8eadde 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java
@@ -46,6 +46,6 @@ public class MetricsHBaseServerWrapperStub implements MetricsHBaseServerWrapper{
 
   @Override
   public int getActiveRpcHandlerCount() {
-    return 100;
+    return 106;
   }
 }
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 ad99fe0875f..1885e0e76ab 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
@@ -64,6 +64,7 @@ public class TestRpcMetrics {
     HELPER.assertGauge("numCallsInReplicationQueue", 103, serverSource);
     HELPER.assertGauge("numCallsInPriorityQueue", 104, serverSource);
     HELPER.assertGauge("numOpenConnections", 105, serverSource);
+    HELPER.assertGauge("numActiveHandler", 106, serverSource);
   }
 
   /**