diff --git a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index b87ad7e..71711c1 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1088,16 +1088,16 @@ public class HBaseAdmin implements Abortable, Closeable { if (serverName != null) { Pair pair = MetaReader.getRegion(ct, regionname); if (pair == null || pair.getFirst() == null) { - LOG.info("No region in .META. for " + - Bytes.toStringBinary(regionname) + "; pair=" + pair); + throw new UnknownRegionException(Bytes.toStringBinary(regionname)); } else { closeRegion(new ServerName(serverName), pair.getFirst()); } } else { Pair pair = MetaReader.getRegion(ct, regionname); - if (pair == null || pair.getSecond() == null) { - LOG.info("No server in .META. for " + - Bytes.toStringBinary(regionname) + "; pair=" + pair); + if (pair == null) { + throw new UnknownRegionException(Bytes.toStringBinary(regionname)); + } else if (pair.getSecond() == null) { + throw new NoServerForRegionException(Bytes.toStringBinary(regionname)); } else { closeRegion(pair.getSecond(), pair.getFirst()); } @@ -1190,8 +1190,7 @@ public class HBaseAdmin implements Abortable, Closeable { = getRegion(tableNameOrRegionName, ct); if (regionServerPair != null) { if (regionServerPair.getSecond() == null) { - LOG.info("No server in .META. for " + - Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + regionServerPair); + throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName)); } else { flush(regionServerPair.getSecond(), regionServerPair.getFirst()); } @@ -1294,8 +1293,7 @@ public class HBaseAdmin implements Abortable, Closeable { = getRegion(tableNameOrRegionName, ct); if (regionServerPair != null) { if (regionServerPair.getSecond() == null) { - LOG.info("No server in .META. for " + - Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + regionServerPair); + throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName)); } else { compact(regionServerPair.getSecond(), regionServerPair.getFirst(), major); } @@ -1467,8 +1465,7 @@ public class HBaseAdmin implements Abortable, Closeable { = getRegion(tableNameOrRegionName, ct); if (regionServerPair != null) { if (regionServerPair.getSecond() == null) { - LOG.info("No server in .META. for " + - Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + regionServerPair); + throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName)); } else { split(regionServerPair.getSecond(), regionServerPair.getFirst(), splitPoint); } @@ -1765,8 +1762,7 @@ public class HBaseAdmin implements Abortable, Closeable { = getRegion(tableNameOrRegionName, ct); if (regionServerPair != null) { if (regionServerPair.getSecond() == null) { - LOG.info("No server in .META. for " + - Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + regionServerPair); + throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName)); } else { ServerName sn = regionServerPair.getSecond(); HRegionInterface rs =