Repository: hbase Updated Branches: refs/heads/branch-1.4 c8f4af0e8 -> 7ffd0e503
HBASE-20139 NPE in RSRpcServices.get() when getRegion throws an exception Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7ffd0e50 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7ffd0e50 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7ffd0e50 Branch: refs/heads/branch-1.4 Commit: 7ffd0e503b1c7e1c4d67e68d5bfb54bc0fa85ff7 Parents: c8f4af0 Author: Abhishek Singh Chouhan <achou...@apache.org> Authored: Tue Mar 6 16:26:31 2018 +0530 Committer: Abhishek Singh Chouhan <achou...@apache.org> Committed: Wed Mar 7 12:12:20 2018 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7ffd0e50/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index fb888d4..ec9f077 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -2290,9 +2290,12 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } catch (IOException ie) { throw new ServiceException(ie); } finally { - if (regionServer.metricsRegionServer != null && region != null) { - regionServer.metricsRegionServer.updateGet( - region.getTableDesc().getTableName(), EnvironmentEdgeManager.currentTime() - before); + MetricsRegionServer mrs = regionServer.metricsRegionServer; + if (mrs != null) { + HTableDescriptor td = region != null ? region.getTableDesc() : null; + if (td != null) { + mrs.updateGet(td.getTableName(), EnvironmentEdgeManager.currentTime() - before); + } } if (quota != null) { quota.close();
