Skip to content

Commit

Permalink
HBASE-25070 : With new generic API getLogEntries, cleaning up unused …
Browse files Browse the repository at this point in the history
…RPC APIs

Closes #2426

Signed-off-by: Guanghao Zhang <zghao@apache.org>
  • Loading branch information
virajjasani committed Sep 28, 2020
1 parent 86557ed commit 80ffac2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2512,8 +2512,8 @@ Pair<List<String>, List<TableName>> getConfiguredNamespacesAndTablesInRSGroup(St
* Examples include slow/large RPC logs, balancer decisions by master.
*
* @param serverNames servers to retrieve records from, useful in case of records maintained
* by RegionServer as we can select specific server. In case of servertype=MASTER, logs will
* only come from the currently active master.
* by RegionServer as we can select specific server. In case of servertype=MASTER, logs will
* only come from the currently active master.
* @param logType string representing type of log records
* @param serverType enum for server type: HMaster or RegionServer
* @param limit put a limit to list of records that server should send in response
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1714,8 +1714,8 @@ default CompletableFuture<List<OnlineLogRecord>> getSlowLogResponses(
* Examples include slow/large RPC logs, balancer decisions by master.
*
* @param serverNames servers to retrieve records from, useful in case of records maintained
* by RegionServer as we can select specific server. In case of servertype=MASTER, logs will
* only come from the currently active master.
* by RegionServer as we can select specific server. In case of servertype=MASTER, logs will
* only come from the currently active master.
* @param logType string representing type of log records
* @param serverType enum for server type: HMaster or RegionServer
* @param limit put a limit to list of records that server should send in response
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,6 @@ service AdminService {
rpc ExecuteProcedures(ExecuteProceduresRequest)
returns(ExecuteProceduresResponse);

rpc GetSlowLogResponses(SlowLogResponseRequest)
returns(SlowLogResponses);

rpc GetLargeLogResponses(SlowLogResponseRequest)
returns(SlowLogResponses);

rpc ClearSlowLogsResponses(ClearSlowLogResponseRequest)
returns(ClearSlowLogResponses);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3851,19 +3851,6 @@ public ExecuteProceduresResponse executeProcedures(RpcController controller,
}
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public SlowLogResponses getSlowLogResponses(final RpcController controller,
final SlowLogResponseRequest request) {
final NamedQueueRecorder namedQueueRecorder =
this.regionServer.getNamedQueueRecorder();
final List<SlowLogPayload> slowLogPayloads = getSlowLogPayloads(request, namedQueueRecorder);
SlowLogResponses slowLogResponses = SlowLogResponses.newBuilder()
.addAllSlowLogPayloads(slowLogPayloads)
.build();
return slowLogResponses;
}

private List<SlowLogPayload> getSlowLogPayloads(SlowLogResponseRequest request,
NamedQueueRecorder namedQueueRecorder) {
if (namedQueueRecorder == null) {
Expand All @@ -3881,19 +3868,6 @@ private List<SlowLogPayload> getSlowLogPayloads(SlowLogResponseRequest request,
return slowLogPayloads;
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public SlowLogResponses getLargeLogResponses(final RpcController controller,
final SlowLogResponseRequest request) {
final NamedQueueRecorder namedQueueRecorder =
this.regionServer.getNamedQueueRecorder();
final List<SlowLogPayload> slowLogPayloads = getSlowLogPayloads(request, namedQueueRecorder);
SlowLogResponses slowLogResponses = SlowLogResponses.newBuilder()
.addAllSlowLogPayloads(slowLogPayloads)
.build();
return slowLogResponses;
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public ClearSlowLogResponses clearSlowLogsResponses(final RpcController controller,
Expand All @@ -3911,6 +3885,7 @@ public ClearSlowLogResponses clearSlowLogsResponses(final RpcController controll
}

@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public HBaseProtos.LogEntry getLogEntries(RpcController controller,
HBaseProtos.LogRequest request) throws ServiceException {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ReplicateWALEntryResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SlowLogResponseRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SlowLogResponses;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateConfigurationRequest;
Expand Down Expand Up @@ -679,18 +677,6 @@ public ExecuteProceduresResponse executeProcedures(RpcController controller,
return null;
}

@Override
public SlowLogResponses getSlowLogResponses(RpcController controller,
SlowLogResponseRequest request) throws ServiceException {
return null;
}

@Override
public SlowLogResponses getLargeLogResponses(RpcController controller,
SlowLogResponseRequest request) throws ServiceException {
return null;
}

@Override
public ClearSlowLogResponses clearSlowLogsResponses(RpcController controller,
ClearSlowLogResponseRequest request) throws ServiceException {
Expand Down

0 comments on commit 80ffac2

Please sign in to comment.