HBASE-26086 TestHRegionReplayEvents do not pass in branch-2 and throws NullPointerException (#3480)

binlijin · binlijin · commit 1d0cfa9ed44d · 2021-07-15T09:53:34.000+08:00
Signed-off-by: Duo Zhang &lt;zhangduo@apache.org&gt;
Signed-off-by: Anoop Sam John &lt;anoopsamjohn@apache.org&gt;
Signed-off-by: Reid Chan &lt;reidchan@apache.org&gt;
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -8290,7 +8290,7 @@ void metricsUpdateForGet(List<Cell> results, long before) {
     if (this.metricsRegion != null) {
       this.metricsRegion.updateGet(EnvironmentEdgeManager.currentTime() - before);
     }
-    if (rsServices != null) {
+    if (rsServices != null && this.rsServices.getMetrics() != null) {
       rsServices.getMetrics().updateReadQueryMeter(getTableDescriptor().getTableName(), 1);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -8290,7 +8290,7 @@ void metricsUpdateForGet(List<Cell> results, long before) {`
`8290`	`8290`	`if (this.metricsRegion != null) {`
`8291`	`8291`	`this.metricsRegion.updateGet(EnvironmentEdgeManager.currentTime() - before);`
`8292`	`8292`	`}`
`8293`		`- if (rsServices != null) {`
	`8293`	`+ if (rsServices != null && this.rsServices.getMetrics() != null) {`
`8294`	`8294`	`rsServices.getMetrics().updateReadQueryMeter(getTableDescriptor().getTableName(), 1);`
`8295`	`8295`	`}`
`8296`	`8296`	`}`