You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/05/18 14:46:12 UTC
(hbase) branch branch-2.5 updated: HBASE-28595: check seq id of scan RPCs for closed scanners (#5910) (#5924)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 8acfc0794fd HBASE-28595: check seq id of scan RPCs for closed scanners (#5910) (#5924)
8acfc0794fd is described below
commit 8acfc0794fdb56e69550611ad46ba15635de8a74
Author: Tak Lon (Stephen) Wu <ta...@apache.org>
AuthorDate: Sat May 18 07:46:07 2024 -0700
HBASE-28595: check seq id of scan RPCs for closed scanners (#5910) (#5924)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Tak Lon (Stephen) Wu <ta...@apache.org>
Co-authored-by: csringhofer <cs...@cloudera.com>
---
.../hadoop/hbase/regionserver/RSRpcServices.java | 33 +++++++++++++++-------
1 file changed, 23 insertions(+), 10 deletions(-)
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 9807078ce46..584c2baab49 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
@@ -355,10 +355,11 @@ public class RSRpcServices
private ScannerIdGenerator scannerIdGenerator;
private final ConcurrentMap<String, RegionScannerHolder> scanners = new ConcurrentHashMap<>();
- // Hold the name of a closed scanner for a while. This is used to keep compatible for old clients
- // which may send next or close request to a region scanner which has already been exhausted. The
- // entries will be removed automatically after scannerLeaseTimeoutPeriod.
- private final Cache<String, String> closedScanners;
+ // Hold the name and last sequence number of a closed scanner for a while. This is used
+ // to keep compatible for old clients which may send next or close request to a region
+ // scanner which has already been exhausted. The entries will be removed automatically
+ // after scannerLeaseTimeoutPeriod.
+ private final Cache<String, Long> closedScanners;
/**
* The lease timeout period for client scanners (milliseconds).
*/
@@ -3127,8 +3128,18 @@ public class RSRpcServices
RegionScannerHolder rsh = this.scanners.get(scannerName);
if (rsh == null) {
// just ignore the next or close request if scanner does not exists.
- if (closedScanners.getIfPresent(scannerName) != null) {
- throw SCANNER_ALREADY_CLOSED;
+ Long lastCallSeq = closedScanners.getIfPresent(scannerName);
+ if (lastCallSeq != null) {
+ // Check the sequence number to catch if the last call was incorrectly retried.
+ // The only allowed scenario is when the scanner is exhausted and one more scan
+ // request arrives - in this case returning 0 rows is correct.
+ if (request.hasNextCallSeq() && request.getNextCallSeq() != lastCallSeq + 1) {
+ throw new OutOfOrderScannerNextException("Expected nextCallSeq for closed request: "
+ + (lastCallSeq + 1) + " But the nextCallSeq got from client: "
+ + request.getNextCallSeq() + "; request=" + TextFormat.shortDebugString(request));
+ } else {
+ throw SCANNER_ALREADY_CLOSED;
+ }
} else {
LOG.warn("Client tried to access missing scanner " + scannerName);
throw new UnknownScannerException(
@@ -3699,7 +3710,7 @@ public class RSRpcServices
}
if (!builder.getMoreResults() || !builder.getMoreResultsInRegion() || closeScanner) {
scannerClosed = true;
- closeScanner(region, scanner, scannerName, rpcCall);
+ closeScanner(region, scanner, scannerName, rpcCall, false);
}
// There's no point returning to a timed out client. Throwing ensures scanner is closed
@@ -3715,7 +3726,7 @@ public class RSRpcServices
// The scanner state might be left in a dirty state, so we will tell the Client to
// fail this RPC and close the scanner while opening up another one from the start of
// row that the client has last seen.
- closeScanner(region, scanner, scannerName, rpcCall);
+ closeScanner(region, scanner, scannerName, rpcCall, true);
// If it is a DoNotRetryIOException already, throw as it is. Unfortunately, DNRIOE is
// used in two different semantics.
@@ -3779,7 +3790,7 @@ public class RSRpcServices
}
private void closeScanner(HRegion region, RegionScanner scanner, String scannerName,
- RpcCallContext context) throws IOException {
+ RpcCallContext context, boolean isError) throws IOException {
if (region.getCoprocessorHost() != null) {
if (region.getCoprocessorHost().preScannerClose(scanner)) {
// bypass the actual close.
@@ -3796,7 +3807,9 @@ public class RSRpcServices
if (region.getCoprocessorHost() != null) {
region.getCoprocessorHost().postScannerClose(scanner);
}
- closedScanners.put(scannerName, scannerName);
+ if (!isError) {
+ closedScanners.put(scannerName, rsh.getNextCallSeq());
+ }
}
}