Skip to content

HBASE-29323 Use Priority Handler for all RegionServerStatus rpc at Master #6994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NihalJain merged 7 commits into from
May 19, 2025
Merged

HBASE-29323 Use Priority Handler for all RegionServerStatus rpc at Master #6994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65975f6
HBASE-29323 use ADMIN_QOS priority for reportProcedureDone and report…
May 16, 2025
bbf9f24
HBASE-29323 use HIGH_QOS priority for reportProcedureDone
May 16, 2025
b0214f9
Merge remote-tracking branch 'refs/remotes/upstream/master' into HBAS…
May 17, 2025
0e7404e
HBASE-29323 use HIGH_QOS priority for all param class defined in Regi…
May 17, 2025
c1a2506
HBASE-29323 added JUnits and comment change
May 17, 2025
a8c338b
HBASE-29323 Handling NPE if no enclosing class present
May 17, 2025
e48dc4a
HBASE-29323 resolve test failure for TestMasterQosFunction.testAnnot…
May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/main/java/org/apache/hadoop/hbase/master/MasterAnnotationReadingPriorityFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ protected int getBasePriority(RequestHeader header, Message param) {
}
return HConstants.HIGH_QOS;
}
// also use HIGH_QOS for region server report
if (param instanceof RegionServerStatusProtos.RegionServerReportRequest) {
// also use HIGH_QOS for all rest methods in RegionServerStatusProtos
if (RegionServerStatusProtos.class.equals(param.getClass().getEnclosingClass())) {
return HConstants.HIGH_QOS;
}
// Trust the client-set priorities if set
Expand Down
6 changes: 2 additions & 4 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,8 @@ void stop() {
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
// priority for all RegionServerStatusProtos rpc's are set HIGH_QOS in
// MasterAnnotationReadingPriorityFunction itself
public GetLastFlushedSequenceIdResponse getLastFlushedSequenceId(RpcController controller,
GetLastFlushedSequenceIdRequest request) throws ServiceException {
try {
Expand All @@ -623,7 +624,6 @@ public GetLastFlushedSequenceIdResponse getLastFlushedSequenceId(RpcController c
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public RegionServerReportResponse regionServerReport(RpcController controller,
RegionServerReportRequest request) throws ServiceException {
try {
Expand Down Expand Up @@ -659,7 +659,6 @@ public RegionServerReportResponse regionServerReport(RpcController controller,
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public RegionServerStartupResponse regionServerStartup(RpcController controller,
RegionServerStartupRequest request) throws ServiceException {
// Register with server manager
Expand Down Expand Up @@ -691,7 +690,6 @@ public RegionServerStartupResponse regionServerStartup(RpcController controller,
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public ReportRSFatalErrorResponse reportRSFatalError(RpcController controller,
ReportRSFatalErrorRequest request) throws ServiceException {
String errorText = request.getErrorMessage();
Expand Down
32 changes: 31 additions & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterQosFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;

import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;

import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos;
Expand Down Expand Up @@ -96,6 +98,34 @@ public void testRegionInTransition() throws IOException {

@Test
public void testAnnotations() {
checkMethod(conf, "GetLastFlushedSequenceId", HConstants.ADMIN_QOS, qosFunction);
checkMethod(conf, "GetRegionInfo", HConstants.ADMIN_QOS, qosFunction);
}

@Test
public void testRegionServerStatusProtos() {
RegionServerStatusProtos.RemoteProcedureResult splitWalProcedureResult =
RegionServerStatusProtos.RemoteProcedureResult.newBuilder()
.setStatus(RegionServerStatusProtos.RemoteProcedureResult.Status.SUCCESS).setProcId(100)
.build();

RegionServerStatusProtos.ReportProcedureDoneRequest splitWalProcedureDoneReport =
RegionServerStatusProtos.ReportProcedureDoneRequest.newBuilder()
.addResult(splitWalProcedureResult).build();

RegionServerStatusProtos.GetLastFlushedSequenceIdRequest lastFlushedSequenceIdRequest =
RegionServerStatusProtos.GetLastFlushedSequenceIdRequest.newBuilder()
.setRegionName(ByteString.copyFrom(RegionInfoBuilder.FIRST_META_REGIONINFO.getRegionName()))
.build();

RegionServerStatusProtos.RegionServerReportRequest regionServerReportRequest =
RegionServerStatusProtos.RegionServerReportRequest.newBuilder()
.setServer(ProtobufUtil.toServerName(ServerName.valueOf("locahost:60020", 100))).build();

checkMethod(conf, "ReportProcedureDone", HConstants.HIGH_QOS, qosFunction,
splitWalProcedureDoneReport);
checkMethod(conf, "GetLastFlushedSequenceId", HConstants.HIGH_QOS, qosFunction,
lastFlushedSequenceIdRequest);
checkMethod(conf, "RegionServerReport", HConstants.HIGH_QOS, qosFunction,
regionServerReportRequest);
}
}