HBASE-22715 All scan requests should be handled by scan handler threa…

…ds in RWQueueRpcExecutor (#393) Signed-off-by: Andrew Purtell <apurtell@apache.org>
apache · Jul 24, 2019 · c3a8f6c · c3a8f6c
1 parent 3e7c945
commit c3a8f6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -350,12 +350,7 @@ private boolean isWriteRequest(final RequestHeader header, final Message param)
   }
 
   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
@@ -291,7 +291,7 @@ public void testScanQueues() throws Exception {
 
       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);