You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/07/24 21:39:50 UTC
[hbase] branch master updated: HBASE-22715 All scan requests should
be handled by scan handler threads in RWQueueRpcExecutor (#393)
This is an automated email from the ASF dual-hosted git repository.
apurtell 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 a65e72d HBASE-22715 All scan requests should be handled by scan handler threads in RWQueueRpcExecutor (#393)
a65e72d is described below
commit a65e72d5da0df807e98302dc00b6dc607253af3e
Author: Jeongdae Kim <je...@linecorp.com>
AuthorDate: Fri Jul 19 16:51:34 2019 +0900
HBASE-22715 All scan requests should be handled by scan handler threads in RWQueueRpcExecutor (#393)
Signed-off-by: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
---
.../main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java | 7 +------
.../java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java
index 7187a71..3ce5f0e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java
@@ -229,12 +229,7 @@ public class RWQueueRpcExecutor extends RpcExecutor {
}
private boolean isScanRequest(final RequestHeader header, final Message param) {
- if (param instanceof ScanRequest) {
- // The first scan request will be executed as a "short read"
- ScanRequest request = (ScanRequest)param;
- return request.hasScannerId();
- }
- return false;
+ return param instanceof ScanRequest;
}
/*
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
index a0b3b54..6b6a995 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
@@ -362,7 +362,7 @@ public class TestSimpleRpcScheduler {
CallRunner scanCallTask = mock(CallRunner.class);
ServerCall scanCall = mock(ServerCall.class);
- scanCall.param = ScanRequest.newBuilder().setScannerId(1).build();
+ scanCall.param = ScanRequest.newBuilder().build();
RequestHeader scanHead = RequestHeader.newBuilder().setMethodName("scan").build();
when(scanCallTask.getRpcCall()).thenReturn(scanCall);
when(scanCall.getHeader()).thenReturn(scanHead);