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

HBASE-4578 NPE when altering a table that has moving regions 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1188439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-10-24 23:13:01 +00:00
parent b31527ee35
commit 95a8d2bfc4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -394,6 +394,7 @@ Release 0.92.0 - Unreleased
HBASE-4647 RAT finds about 40 files missing licenses
HBASE-4642 Add Apache License Header
HBASE-4591 TTL for old HLogs should be calculated from last modification time.
HBASE-4578 NPE when altering a table that has moving regions (gaojinchao)
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected

16
src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java
View File

@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.master.handler;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.NavigableMap;
@ -86,7 +87,6 @@ public abstract class TableEventHandler extends EventHandler {
if (eventType.isOnlineSchemaChangeSupported() && this.masterServices.
getAssignmentManager().getZKTable().
isEnabledTable(Bytes.toString(tableName))) {
this.masterServices.getAssignmentManager().setRegionsToReopen(hris);
if (reOpenAllRegions(hris)) {
LOG.info("Completed table operation " + eventType + " on table " +
Bytes.toString(tableName));
@ -108,17 +108,27 @@ public abstract class TableEventHandler extends EventHandler {
TreeMap<ServerName, List<HRegionInfo>> serverToRegions = Maps
.newTreeMap();
NavigableMap<HRegionInfo, ServerName> hriHserverMapping = table.getRegionLocations();
List<HRegionInfo> reRegions = new ArrayList<HRegionInfo>();
for (HRegionInfo hri : regions) {
ServerName rsLocation = hriHserverMapping.get(hri);
// Skip the offlined split parent region
// See HBASE-4578 for more information.
if (null == rsLocation) {
LOG.info("Skip " + hri);
continue;
}
if (!serverToRegions.containsKey(rsLocation)) {
LinkedList<HRegionInfo> hriList = Lists.newLinkedList();
serverToRegions.put(rsLocation, hriList);
}
reRegions.add(hri);
serverToRegions.get(rsLocation).add(hri);
}
LOG.info("Reopening " + regions.size() + " regions on "
LOG.info("Reopening " + reRegions.size() + " regions on "
+ serverToRegions.size() + " region servers.");
this.masterServices.getAssignmentManager().setRegionsToReopen(reRegions);
BulkReOpen bulkReopen = new BulkReOpen(this.server, serverToRegions,
this.masterServices.getAssignmentManager());
while (true) {