Amend HBASE-18000 Make sure we always return the scanner id with ScanResponse (Karan Mehta and Duo Zhang)
Move getRegionScanner() call below builder.setScannerId() to handle a corner case. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9bf5bc19 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9bf5bc19 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9bf5bc19 Branch: refs/heads/branch-1 Commit: 9bf5bc1986098295b0d38b56bf3d45f9a0f5aec9 Parents: ffa3785 Author: Andrew Purtell <apurt...@apache.org> Authored: Thu May 11 14:34:04 2017 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Thu May 11 14:38:28 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9bf5bc19/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- 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 6f25ad4..87ff3d2 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 @@ -2808,10 +2808,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler, ScanResponse.Builder builder = ScanResponse.newBuilder(); try { if (request.hasScannerId()) { - rsh = getRegionScanner(request); // The downstream projects such as AsyncHBase in OpenTSDB need this value. See HBASE-18000 // for more details. builder.setScannerId(request.getScannerId()); + rsh = getRegionScanner(request); } else { rsh = newRegionScanner(request, builder); }
