Author: zjushch Date: Sat Jan 26 03:44:11 2013 New Revision: 1438832 URL: http://svn.apache.org/viewvc?rev=1438832&view=rev Log: HBASE-7669 ROOT region wouldn't be handled by PRI-IPC-Handler(Chunhui)
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1438832&r1=1438831&r2=1438832&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Sat Jan 26 03:44:11 2013 @@ -496,14 +496,14 @@ public class HRegionServer implements HR annotatedQos = qosMap; } - public boolean isMetaRegion(byte[] regionName) { + public boolean isMetaTable(byte[] regionName) { HRegion region; try { region = getRegion(regionName); } catch (NotServingRegionException ignored) { return false; } - return region.getRegionInfo().isMetaRegion(); + return region.getRegionInfo().isMetaTable(); } @Override @@ -530,7 +530,7 @@ public class HRegionServer implements HR } String scannerIdString = Long.toString(scannerId); RegionScanner scanner = scanners.get(scannerIdString); - if (scanner != null && scanner.getRegionInfo().isMetaRegion()) { + if (scanner != null && scanner.getRegionInfo().isMetaTable()) { // LOG.debug("High priority scanner request: " + scannerId); return HConstants.HIGH_QOS; } @@ -538,7 +538,7 @@ public class HRegionServer implements HR // Just let it through. This is getOnlineRegions, etc. } else if (inv.getParameterClasses()[0] == byte[].class) { // first arg is byte array, so assume this is a regionname: - if (isMetaRegion((byte[]) inv.getParameters()[0])) { + if (isMetaTable((byte[]) inv.getParameters()[0])) { // LOG.debug("High priority with method: " + methodName + // " and region: " // + Bytes.toString((byte[]) inv.getParameters()[0])); @@ -555,7 +555,7 @@ public class HRegionServer implements HR // AND this // regionserver hosts META/-ROOT- for (byte[] region : regions) { - if (isMetaRegion(region)) { + if (isMetaTable(region)) { // LOG.debug("High priority multi with region: " + // Bytes.toString(region)); return HConstants.HIGH_QOS; // short circuit for the win.