You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/12/06 00:17:49 UTC
svn commit: r1210700 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
Author: nspiegelberg
Date: Mon Dec 5 23:17:48 2011
New Revision: 1210700
URL: http://svn.apache.org/viewvc?rev=1210700&view=rev
Log:
HBASE-4860 RegionSplitter Should Allow NSFRE during logical split verification
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1210700&r1=1210699&r2=1210700&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Dec 5 23:17:48 2011
@@ -459,6 +459,7 @@ Release 0.92.0 - Unreleased
(Chunhui Shen)
HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H)
HBASE-4942 HMaster is unable to start of HFile V1 is used (honghua Zhu)
+ HBASE-4860 RegionSplitter Should Allow NSFRE during logical split verification
TESTS
HBASE-4492 TestRollingRestart fails intermittently
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java?rev=1210700&r1=1210699&r2=1210700&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java Mon Dec 5 23:17:48 2011
@@ -564,8 +564,15 @@ public class RegionSplitter {
byte[] split = region.getSecond();
// see if the new split daughter region has come online
- HRegionInfo dri = table.getRegionLocation(split).getRegionInfo();
- if (dri.isOffline() || !Bytes.equals(dri.getStartKey(), split)) {
+ try {
+ HRegionInfo dri = table.getRegionLocation(split).getRegionInfo();
+ if (dri.isOffline() || !Bytes.equals(dri.getStartKey(), split)) {
+ logicalSplitting.add(region);
+ continue;
+ }
+ } catch (NoServerForRegionException nsfre) {
+ // NSFRE will occur if the old META entry has no server assigned
+ LOG.info(nsfre);
logicalSplitting.add(region);
continue;
}