You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2015/12/24 22:19:25 UTC
hbase git commit: HBASE-14822; addendum - handle callSeq.
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 86d4e2084 -> 9c44260e5
HBASE-14822; addendum - handle callSeq.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9c44260e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9c44260e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9c44260e
Branch: refs/heads/branch-1.0
Commit: 9c44260e510c1380767c1517c0c891089673c4e1
Parents: 86d4e20
Author: Lars Hofhansl <la...@apache.org>
Authored: Thu Dec 24 13:17:21 2015 -0800
Committer: Lars Hofhansl <la...@apache.org>
Committed: Thu Dec 24 13:17:21 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9c44260e/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 fe7ee2e..9c6de0f 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
@@ -2078,9 +2078,12 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
ttl = this.scannerLeaseTimeoutPeriod;
}
if (request.hasRenew() && request.getRenew()) {
+ rsh = scanners.get(scannerName);
lease = regionServer.leases.removeLease(scannerName);
- if (lease != null && scanners.containsKey(scannerName)) {
+ if (lease != null && rsh != null) {
regionServer.leases.addLease(lease);
+ // Increment the nextCallSeq value which is the next expected from client.
+ rsh.incNextCallSeq();
}
return builder.build();
}