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

HBASE-9710 Use the region name, not the encoded name, when region is not on current server 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1541820 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-11-14 05:01:29 +00:00
parent 5583310bb1
commit e15f36cdde
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -2584,11 +2584,16 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
protected HRegion getRegion(final byte[] regionName) protected HRegion getRegion(final byte[] regionName)
throws NotServingRegionException { throws NotServingRegionException {
String encodedRegionName = HRegionInfo.encodeRegionName(regionName); String encodedRegionName = HRegionInfo.encodeRegionName(regionName);
return getRegionByEncodedName(encodedRegionName); return getRegionByEncodedName(regionName, encodedRegionName);
} }
protected HRegion getRegionByEncodedName(String encodedRegionName) protected HRegion getRegionByEncodedName(String encodedRegionName)
throws NotServingRegionException { throws NotServingRegionException {
return getRegionByEncodedName(null, encodedRegionName);
}
protected HRegion getRegionByEncodedName(byte[] regionName, String encodedRegionName)
throws NotServingRegionException {
HRegion region = this.onlineRegions.get(encodedRegionName); HRegion region = this.onlineRegions.get(encodedRegionName);
if (region == null) { if (region == null) {
MovedRegionInfo moveInfo = getMovedRegion(encodedRegionName); MovedRegionInfo moveInfo = getMovedRegion(encodedRegionName);
@ -2596,10 +2601,12 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
throw new RegionMovedException(moveInfo.getServerName(), moveInfo.getSeqNum()); throw new RegionMovedException(moveInfo.getServerName(), moveInfo.getSeqNum());
} }
Boolean isOpening = this.regionsInTransitionInRS.get(Bytes.toBytes(encodedRegionName)); Boolean isOpening = this.regionsInTransitionInRS.get(Bytes.toBytes(encodedRegionName));
String regionNameStr = regionName == null?
encodedRegionName: Bytes.toStringBinary(regionName);
if (isOpening != null && isOpening.booleanValue()) { if (isOpening != null && isOpening.booleanValue()) {
throw new RegionOpeningException("Region is being opened: " + encodedRegionName); throw new RegionOpeningException("Region " + regionNameStr + " is opening");
} }
throw new NotServingRegionException("Region is not online: " + encodedRegionName); throw new NotServingRegionException("Region " + regionNameStr + " is not online");
} }
return region; return region;
} }
@ -3965,7 +3972,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
*/ */
protected HRegion getRegion( protected HRegion getRegion(
final RegionSpecifier regionSpecifier) throws IOException { final RegionSpecifier regionSpecifier) throws IOException {
return getRegionByEncodedName( return getRegionByEncodedName(regionSpecifier.getValue().toByteArray(),
ProtobufUtil.getRegionEncodedName(regionSpecifier)); ProtobufUtil.getRegionEncodedName(regionSpecifier));
} }