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

HBASE-3874 ServerShutdownHandler fails on NPE if a plan has a random 

region assignment


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1124477 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2011-05-19 00:24:18 +00:00
parent cf8be18f15
commit d64c76fe10
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGES.txt
View File

@ -256,14 +256,15 @@ Release 0.91.0 - Unreleased
Release 0.90.4 - Unreleased Release 0.90.4 - Unreleased
BUG FIXES BUG FIXES
HBASE-3878 Hbase client throws NoSuchElementException (Ted Yu) HBASE-3878 Hbase client throws NoSuchElementException (Ted Yu)
HBASE-3878 Hbase client throws NoSuchElementException (Ted Yu) HBASE-3881 Add disable balancer in graceful_stop.sh script
HBASE-3881 Add disable balancer in graceful_stop.sh script HBASE-3895 Fix order of parameters after HBASE-1511
HBASE-3895 Fix order of parameters after HBASE-1511 HBASE-3874 ServerShutdownHandler fails on NPE if a plan has a random
region assignment
IMPROVEMENT IMPROVEMENT
HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the
sun jre provided by RHEL6 (Roman Shaposhnik) sun jre provided by RHEL6 (Roman Shaposhnik)
Release 0.90.3 - Unreleased Release 0.90.3 - Unreleased

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

@ -1995,7 +1995,9 @@ public class AssignmentManager extends ZooKeeperListener {
for (Iterator <Map.Entry<String, RegionPlan>> i = for (Iterator <Map.Entry<String, RegionPlan>> i =
this.regionPlans.entrySet().iterator(); i.hasNext();) { this.regionPlans.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, RegionPlan> e = i.next(); Map.Entry<String, RegionPlan> e = i.next();
if (e.getValue().getDestination().equals(sn)) { ServerName otherSn = e.getValue().getDestination();
// The name will be null if the region is planned for a random assign.
if (otherSn != null && otherSn.equals(sn)) {
// Use iterator's remove else we'll get CME // Use iterator's remove else we'll get CME
i.remove(); i.remove();
} }