commit 0e727de4d48298cb256db4074e8e95894c29eb49
author chenheng <chenheng@apache.org> Tue Jan 12 14:32:55 2016 +0800
committer Andrew Purtell <apurtell@apache.org> Fri Mar 18 16:39:10 2016 -0700
tree 6d5a455704feffc3af4c84f765d1f9eb8996eec3
parent deaf0f3d01cacb4917e67f0db726cd5a4194e3f0

HBASE-15083 Gets from Multiactions are not counted in metrics for gets

Amending-Author: Andrew Purtell <apurtell@apache.org>

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 439bee7..65e52b5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -3728,8 +3728,15 @@
       try {
         Result r = null;
         if (action.hasGet()) {
-          Get get = ProtobufUtil.toGet(action.getGet());
-          r = region.get(get);
+          long before = EnvironmentEdgeManager.currentTimeMillis();
+          try {
+            Get get = ProtobufUtil.toGet(action.getGet());
+            r = region.get(get);
+          } finally {
+            if (metricsRegionServer != null) {
+              metricsRegionServer.updateGet(EnvironmentEdgeManager.currentTimeMillis() - before);
+            }
+          }
         } else if (action.hasServiceCall()) {
           resultOrExceptionBuilder = ResultOrException.newBuilder();
           try {