You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/08/25 03:57:25 UTC
[hbase] branch branch-2.2 updated: HBASE-22904 NPE occurs when RS
send space quota usage report during HMaster init (#529)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 481b2e3 HBASE-22904 NPE occurs when RS send space quota usage report during HMaster init (#529)
481b2e3 is described below
commit 481b2e332e7667a57b74d9933174446adeb31eec
Author: Pankaj <pa...@huawei.com>
AuthorDate: Sun Aug 25 09:26:20 2019 +0530
HBASE-22904 NPE occurs when RS send space quota usage report during HMaster init (#529)
* NPE occurs when RS send space quota usage report during HMaster init
* Added the debug log
Signed-off-by: Sakthi <sa...@apache.org>
Signed-off-by: stack <st...@apache.org>
---
.../apache/hadoop/hbase/master/MasterRpcServices.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index c0d66e7..5823fa7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -2193,10 +2193,15 @@ public class MasterRpcServices extends RSRpcServices
return RegionSpaceUseReportResponse.newBuilder().build();
}
MasterQuotaManager quotaManager = this.master.getMasterQuotaManager();
- final long now = EnvironmentEdgeManager.currentTime();
- for (RegionSpaceUse report : request.getSpaceUseList()) {
- quotaManager.addRegionSize(ProtobufUtil.toRegionInfo(
- report.getRegionInfo()), report.getRegionSize(), now);
+ if (quotaManager != null) {
+ final long now = EnvironmentEdgeManager.currentTime();
+ for (RegionSpaceUse report : request.getSpaceUseList()) {
+ quotaManager.addRegionSize(ProtobufUtil.toRegionInfo(report.getRegionInfo()),
+ report.getRegionSize(), now);
+ }
+ } else {
+ LOG.debug(
+ "Received region space usage report but HMaster is not ready to process it, skipping");
}
return RegionSpaceUseReportResponse.newBuilder().build();
} catch (Exception e) {
@@ -2231,6 +2236,9 @@ public class MasterRpcServices extends RSRpcServices
.setSize(tableSize.getValue()).build());
}
return builder.build();
+ } else {
+ LOG.debug(
+ "Received space quota region size report but HMaster is not ready to process it, skipping");
}
return builder.build();
} catch (Exception e) {