You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2020/09/28 07:25:42 UTC
[hbase] branch master updated: HBASE-25070 : With new generic API
getLogEntries, cleaning up unused RPC APIs
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 80ffac2 HBASE-25070 : With new generic API getLogEntries, cleaning up unused RPC APIs
80ffac2 is described below
commit 80ffac29c102758d2aaafe6c83c1b8621dca5ae6
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Mon Sep 28 12:52:00 2020 +0530
HBASE-25070 : With new generic API getLogEntries, cleaning up unused RPC APIs
Closes #2426
Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
.../java/org/apache/hadoop/hbase/client/Admin.java | 4 ++--
.../org/apache/hadoop/hbase/client/AsyncAdmin.java | 4 ++--
.../src/main/protobuf/server/region/Admin.proto | 6 -----
.../hadoop/hbase/regionserver/RSRpcServices.java | 27 +---------------------
.../hadoop/hbase/master/MockRegionServer.java | 14 -----------
5 files changed, 5 insertions(+), 50 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
index 75d55cf..370ab64 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
@@ -2512,8 +2512,8 @@ public interface Admin extends Abortable, Closeable {
* 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
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
index c2d7e8a..2ed624c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
@@ -1714,8 +1714,8 @@ public interface AsyncAdmin {
* 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
diff --git a/hbase-protocol-shaded/src/main/protobuf/server/region/Admin.proto b/hbase-protocol-shaded/src/main/protobuf/server/region/Admin.proto
index ca0c932..0667292 100644
--- a/hbase-protocol-shaded/src/main/protobuf/server/region/Admin.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/server/region/Admin.proto
@@ -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);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index be64966..a59f5e6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -3851,19 +3851,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
}
}
- @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) {
@@ -3883,19 +3870,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
@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,
final ClearSlowLogResponseRequest request) {
final NamedQueueRecorder namedQueueRecorder =
@@ -3911,6 +3885,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
}
@Override
+ @QosPriority(priority = HConstants.ADMIN_QOS)
public HBaseProtos.LogEntry getLogEntries(RpcController controller,
HBaseProtos.LogRequest request) throws ServiceException {
try {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
index 9a7135c..69a7a79 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
@@ -114,8 +114,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ReplicateWA
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;
@@ -680,18 +678,6 @@ class MockRegionServer implements AdminProtos.AdminService.BlockingInterface,
}
@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 {
return null;