Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3946 The splitted region can be online again while the standby hmaster becomes the active one

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1133459 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-06-08 16:36:53 +00:00
parent bf14e34145
commit 829f254216
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -308,6 +308,8 @@ Release 0.90.4 - Unreleased
the same time (Jieshan Bean)
HBASE-3934 MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
(Ted Yu)
HBASE-3946 The splitted region can be online again while the standby
hmaster becomes the active one (Jieshan Bean)
IMPROVEMENT
HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the

13
src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
View File

@ -1687,14 +1687,17 @@ public class AssignmentManager extends ZooKeeperListener {
Result result = region.getSecond();
// If region was in transition (was in zk) force it offline for reassign
try {
ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
this.master.getServerName());
// Process with existing RS shutdown code
boolean isNotDisabledAndSplitted =
ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
this.catalogTracker);
if (isNotDisabledAndSplitted) {
ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
master.getServerName());
}
} catch (KeeperException.NoNodeException nne) {
// This is fine
}
// Process with existing RS shutdown code
ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
this.catalogTracker);
}
}
}