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

HBASE-4725 NPE in AM#updateTimers 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1197815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-11-04 23:10:08 +00:00
parent bb0c9a11d8
commit 56e19a72dc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -449,6 +449,7 @@ Release 0.92.0 - Unreleased
HBASE-4719 HBase script assumes pre-Hadoop 0.21 layout of jar files HBASE-4719 HBase script assumes pre-Hadoop 0.21 layout of jar files
(Roman Shposhnik) (Roman Shposhnik)
HBASE-4553 The update of .tableinfo is not atomic; we remove then rename HBASE-4553 The update of .tableinfo is not atomic; we remove then rename
HBASE-4725 NPE in AM#updateTimers
TESTS TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected HBASE-4450 test for number of blocks read: to serve as baseline for expected

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

@ -61,7 +61,6 @@ import org.apache.hadoop.hbase.executor.EventHandler.EventType;
import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.executor.ExecutorService;
import org.apache.hadoop.hbase.executor.RegionTransitionData; import org.apache.hadoop.hbase.executor.RegionTransitionData;
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException; import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
import org.apache.hadoop.hbase.master.AssignmentManager.RegionState;
import org.apache.hadoop.hbase.master.handler.ClosedRegionHandler; import org.apache.hadoop.hbase.master.handler.ClosedRegionHandler;
import org.apache.hadoop.hbase.master.handler.DisableTableHandler; import org.apache.hadoop.hbase.master.handler.DisableTableHandler;
import org.apache.hadoop.hbase.master.handler.EnableTableHandler; import org.apache.hadoop.hbase.master.handler.EnableTableHandler;
@ -1056,6 +1055,7 @@ public class AssignmentManager extends ZooKeeperListener {
copy.putAll(this.regionPlans); copy.putAll(this.regionPlans);
} }
for (Map.Entry<String, RegionPlan> e: copy.entrySet()) { for (Map.Entry<String, RegionPlan> e: copy.entrySet()) {
if (e.getValue() == null || e.getValue().getDestination() == null) continue;
if (!e.getValue().getDestination().equals(sn)) continue; if (!e.getValue().getDestination().equals(sn)) continue;
RegionState rs = null; RegionState rs = null;
synchronized (this.regionsInTransition) { synchronized (this.regionsInTransition) {