You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/12/02 00:52:31 UTC
hbase git commit: HBASE-19395 [branch-1]
TestEndToEndSplitTransaction.testMasterOpsWhileSplitting fails with NPE
Repository: hbase
Updated Branches:
refs/heads/branch-1 6938720c1 -> ab1d5e05a
HBASE-19395 [branch-1] TestEndToEndSplitTransaction.testMasterOpsWhileSplitting fails with NPE
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ab1d5e05
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ab1d5e05
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ab1d5e05
Branch: refs/heads/branch-1
Commit: ab1d5e05a8559eb28f4e25612204e67b76200a71
Parents: 6938720
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Dec 1 15:30:16 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Dec 1 15:31:52 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ab1d5e05/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 a93a158..3ac08f4 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
@@ -2267,7 +2267,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
} catch (IOException ie) {
throw new ServiceException(ie);
} finally {
- if (regionServer.metricsRegionServer != null) {
+ if (regionServer.metricsRegionServer != null && region != null) {
regionServer.metricsRegionServer.updateGet(
region.getTableDesc().getTableName(), EnvironmentEdgeManager.currentTime() - before);
}