Repository: hbase Updated Branches: refs/heads/master 14c2c0029 -> 5136c7055
hbase-11094: https://issues.apache.org/jira/browse/HBASE-11094(addendum) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5136c705 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5136c705 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5136c705 Branch: refs/heads/master Commit: 5136c70554b6ead2f91e99b53389b10710639127 Parents: 14c2c00 Author: Jeffrey Zhong <[email protected]> Authored: Sun Jun 15 12:01:23 2014 -0700 Committer: Jeffrey Zhong <[email protected]> Committed: Sun Jun 15 12:01:23 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5136c705/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 efbfde1..4d133c3 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 @@ -1263,8 +1263,8 @@ public class RSRpcServices implements HBaseRPCErrorHandler, region.getEncodedName())) { // check if current region open is for distributedLogReplay. This check is to support // rolling restart/upgrade where we want to Master/RS see same configuration - if (regionOpenInfo.hasOpenForDistributedLogReplay() - && regionOpenInfo.getOpenForDistributedLogReplay()) { + if (!regionOpenInfo.hasOpenForDistributedLogReplay() + || regionOpenInfo.getOpenForDistributedLogReplay()) { regionServer.recoveringRegions.put(region.getEncodedName(), null); } else { // remove stale recovery region from ZK when we open region not for recovering which
