Skip to content
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

HBASE-25807 Move method reportProcedureDone from RegionServerStatus.p… #3205

Merged
merged 1 commit into from
May 24, 2021
Merged

HBASE-25807 Move method reportProcedureDone from RegionServerStatus.p… #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions hbase-protocol-shaded/src/main/protobuf/server/master/Master.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,23 @@ message ListReplicationSinkServersResponse {
repeated ServerName server_name = 1;
}

message RemoteProcedureResult {
required uint64 proc_id = 1;
enum Status {
SUCCESS = 1;
ERROR = 2;
}
required Status status = 2;
optional ForeignExceptionMessage error = 3;
}

message ReportProcedureDoneRequest {
repeated RemoteProcedureResult result = 1;
}

message ReportProcedureDoneResponse {
}

service MasterService {
/** Used by the client to get the number of regions that have received the updated schema */
rpc GetSchemaAlterStatus(GetSchemaAlterStatusRequest)
Expand Down Expand Up @@ -1160,6 +1177,9 @@ service MasterService {

rpc ListReplicationSinkServers(ListReplicationSinkServersRequest)
returns (ListReplicationSinkServersResponse);

rpc ReportProcedureDone(ReportProcedureDoneRequest)
returns(ReportProcedureDoneResponse);
}

// HBCK Service definitions.
Expand Down
21 changes: 5 additions & 16 deletions hbase-protocol-shaded/src/main/protobuf/server/master/RegionServerStatus.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ option optimize_for = SPEED;
import "HBase.proto";
import "server/ClusterStatus.proto";
import "server/ErrorHandling.proto";
import "server/master/Master.proto";

message RegionServerStartupRequest {
/** Port number this regionserver is up on */
Expand Down Expand Up @@ -147,22 +148,6 @@ message RegionSpaceUseReportRequest {
message RegionSpaceUseReportResponse {
}

message RemoteProcedureResult {
required uint64 proc_id = 1;
enum Status {
SUCCESS = 1;
ERROR = 2;
}
required Status status = 2;
optional ForeignExceptionMessage error = 3;
}
message ReportProcedureDoneRequest {
repeated RemoteProcedureResult result = 1;
}

message ReportProcedureDoneResponse {
}

message FileArchiveNotificationRequest {
message FileWithSize {
optional TableName table_name = 1;
Expand Down Expand Up @@ -211,6 +196,10 @@ service RegionServerStatusService {
rpc ReportRegionSpaceUse(RegionSpaceUseReportRequest)
returns(RegionSpaceUseReportResponse);

/**
* In HBASE-25807 this method was moved to Master.proto as replication server also need this.
* To avoid problems during upgrading, still keep this method here.
*/
rpc ReportProcedureDone(ReportProcedureDoneRequest)
returns(ReportProcedureDoneResponse);

Expand Down
6 changes: 3 additions & 3 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 @@ -290,6 +290,9 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RecommissionRegionServerRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RecommissionRegionServerResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RegionSpecifierAndState;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoteProcedureResult;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ReportProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ReportProcedureDoneResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RestoreSnapshotRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RestoreSnapshotResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RunCatalogScanRequest;
Expand Down Expand Up @@ -377,9 +380,6 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseReportRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseReportResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RemoteProcedureResult;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportProcedureDoneResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;
Expand Down
5 changes: 3 additions & 2 deletions ...-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServicesVersionWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;

import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos;

/**
Expand Down Expand Up @@ -96,8 +97,8 @@ public RegionServerStatusProtos.RegionSpaceUseReportResponse reportRegionSpaceUs
}

@Override
public RegionServerStatusProtos.ReportProcedureDoneResponse reportProcedureDone(
RpcController controller, RegionServerStatusProtos.ReportProcedureDoneRequest request)
public MasterProtos.ReportProcedureDoneResponse reportProcedureDone(
RpcController controller, MasterProtos.ReportProcedureDoneRequest request)
throws ServiceException {
return masterRpcServices.reportProcedureDone(controller, request);
}
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier;
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType;
import org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos.LockService;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ReportProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse;
Expand All @@ -235,7 +236,6 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseReportRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;
Expand Down
7 changes: 3 additions & 4 deletions ...ver/src/main/java/org/apache/hadoop/hbase/regionserver/RemoteProcedureResultReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

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

import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RemoteProcedureResult;
import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoteProcedureResult;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ReportProcedureDoneRequest;

/**
* A thread which calls {@code reportProcedureDone} to tell master the result of a remote procedure.
Expand Down Expand Up @@ -101,8 +101,7 @@ public void run() {
}
LOG.info("Failed procedure report " + TextFormat.shortDebugString(request) + "; retry (#" +
tries + ")" + (pause ? " after " + pauseTime + "ms delay (Master is coming online...)."
: " immediately."),
e);
: " immediately."), e);
Threads.sleep(pauseTime);
tries++;
}
Expand Down