Repository: hbase Updated Branches: refs/heads/branch-1.3 41dc37428 -> daa4940ef
HBASE-17264 Processing RIT with offline state will always fail to open the first time (Allan Yang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/daa4940e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/daa4940e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/daa4940e Branch: refs/heads/branch-1.3 Commit: daa4940ef1f5b1153629370d9aea07ad6e3d1794 Parents: 41dc374 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Feb 6 19:49:08 2017 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Feb 6 19:49:08 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/AssignmentManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/daa4940e/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 1af826e..5c040dd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -848,7 +848,7 @@ public class AssignmentManager extends ZooKeeperListener { case M_ZK_REGION_OFFLINE: // Insert in RIT and resend to the regionserver - regionStates.updateRegionState(rt, State.PENDING_OPEN); + regionStates.updateRegionState(rt, State.OFFLINE); final RegionState rsOffline = regionStates.getRegionState(regionInfo); this.executorService.submit( new EventHandler(server, EventType.M_MASTER_RECOVERY) { @@ -858,7 +858,7 @@ public class AssignmentManager extends ZooKeeperListener { try { RegionPlan plan = new RegionPlan(regionInfo, null, sn); addPlan(encodedName, plan); - assign(rsOffline, false, false); + assign(rsOffline, true, false); } finally { lock.unlock(); } @@ -1582,6 +1582,7 @@ public class AssignmentManager extends ZooKeeperListener { /** * Use care with forceNewPlan. It could cause double assignment. */ + @VisibleForTesting public void assign(HRegionInfo region, boolean setOfflineInZK, boolean forceNewPlan) { if (isDisabledorDisablingRegionInRIT(region)) { @@ -2059,7 +2060,7 @@ public class AssignmentManager extends ZooKeeperListener { * @param setOfflineInZK * @param forceNewPlan */ - private void assign(RegionState state, + public void assign(RegionState state, boolean setOfflineInZK, final boolean forceNewPlan) { long startTime = EnvironmentEdgeManager.currentTime(); try {
