This is an automated email from the ASF dual-hosted git repository.
binlijin pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 12f2a16 HBASE-26086 TestHRegionReplayEvents do not pass in branch-2
and throws NullPointerException (#3480)
12f2a16 is described below
commit 12f2a16280ee0f5e5dd2aa687f3a6dd776d1f7c4
Author: binlijin <[email protected]>
AuthorDate: Wed Jul 14 11:37:25 2021 +0800
HBASE-26086 TestHRegionReplayEvents do not pass in branch-2 and throws
NullPointerException (#3480)
Signed-off-by: Duo Zhang <[email protected]>
Signed-off-by: Anoop Sam John <[email protected]>
Signed-off-by: Reid Chan <[email protected]>
---
.../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 90cfbde..e5bb017 100644
---
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
@@ -7526,7 +7526,7 @@ public class HRegion implements HeapSize,
PropagatingConfigurationObserver, Regi
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);
}
}
