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:40:22 UTC

[hbase] branch branch-1.3 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 branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 55bd5ec  HBASE-22715 All scan requests should be handled by scan handler threads in RWQueueRpcExecutor (#393)
55bd5ec is described below

commit 55bd5ec4137c513cabab643c2d245c4737f894a0
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>
---
 .../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 6970c74..c286b0e 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
@@ -234,12 +234,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;
   }
 
   @Override
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 60e2e2c..2c8dafc 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
@@ -292,7 +292,7 @@ public class TestSimpleRpcScheduler {
 
       CallRunner scanCallTask = mock(CallRunner.class);
       RpcServer.Call scanCall = mock(RpcServer.Call.class);
-      scanCall.param = ScanRequest.newBuilder().setScannerId(1).build();
+      scanCall.param = ScanRequest.newBuilder().build();
       RequestHeader scanHead = RequestHeader.newBuilder().setMethodName("scan").build();
       when(scanCallTask.getCall()).thenReturn(scanCall);
       when(scanCall.getHeader()).thenReturn(scanHead);