diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java index 8a383e4..452c5f4 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java @@ -282,9 +282,8 @@ public class CatalogTracker { * not currently available. * @return {@link ServerName} for server hosting -ROOT- or null * if none available - * @throws InterruptedException */ - public ServerName getRootLocation() throws InterruptedException { + public ServerName getRootLocation() { return this.rootRegionTracker.getRootRegionLocation(); } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java index b0ec0e7..f6c5f5e 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java @@ -365,12 +365,8 @@ public class MetaReader { byte [] tableName, final boolean excludeOfflinedSplitParents) throws IOException { List> result = null; - try { - result = getTableRegionsAndLocations(catalogTracker, tableName, + result = getTableRegionsAndLocations(catalogTracker, tableName, excludeOfflinedSplitParents); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } return getListOfHRegionInfos(result); } @@ -432,11 +428,10 @@ public class MetaReader { * @param tableName * @return Return list of regioninfos and server. * @throws IOException - * @throws InterruptedException */ public static List> getTableRegionsAndLocations(CatalogTracker catalogTracker, String tableName) - throws IOException, InterruptedException { + throws IOException { return getTableRegionsAndLocations(catalogTracker, Bytes.toBytes(tableName), true); } @@ -446,12 +441,11 @@ public class MetaReader { * @param tableName * @return Return list of regioninfos and server addresses. * @throws IOException - * @throws InterruptedException */ public static List> getTableRegionsAndLocations(final CatalogTracker catalogTracker, final byte [] tableName, final boolean excludeOfflinedSplitParents) - throws IOException, InterruptedException { + throws IOException { if (Bytes.equals(tableName, HConstants.ROOT_TABLE_NAME)) { // If root, do a bit of special handling. ServerName serverName = catalogTracker.getRootLocation(); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 9e1b0b8..4443bd2 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1199,10 +1199,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to flush * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void flush(final String tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { flush(Bytes.toBytes(tableNameOrRegionName)); } @@ -1212,10 +1211,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to flush * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void flush(final byte [] tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { CatalogTracker ct = getCatalogTracker(); try { Pair regionServerPair @@ -1268,10 +1266,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void compact(final String tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { compact(Bytes.toBytes(tableNameOrRegionName)); } @@ -1281,10 +1278,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void compact(final byte [] tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { compact(tableNameOrRegionName, null, false); } @@ -1295,10 +1291,9 @@ public class HBaseAdmin implements Abortable, Closeable { * @param tableOrRegionName table or region to compact * @param columnFamily column family within a table or region * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void compact(String tableOrRegionName, String columnFamily) - throws IOException, InterruptedException { + throws IOException { compact(Bytes.toBytes(tableOrRegionName), Bytes.toBytes(columnFamily)); } @@ -1309,10 +1304,9 @@ public class HBaseAdmin implements Abortable, Closeable { * @param tableNameOrRegionName table or region to compact * @param columnFamily column family within a table or region * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void compact(final byte [] tableNameOrRegionName, final byte[] columnFamily) - throws IOException, InterruptedException { + throws IOException { compact(tableNameOrRegionName, columnFamily, false); } @@ -1322,10 +1316,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to major compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void majorCompact(final String tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { majorCompact(Bytes.toBytes(tableNameOrRegionName)); } @@ -1335,10 +1328,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to major compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void majorCompact(final byte [] tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { compact(tableNameOrRegionName, null, true); } @@ -1349,10 +1341,9 @@ public class HBaseAdmin implements Abortable, Closeable { * @param tableNameOrRegionName table or region to major compact * @param columnFamily column family within a table or region * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void majorCompact(final String tableNameOrRegionName, - final String columnFamily) throws IOException, InterruptedException { + final String columnFamily) throws IOException { majorCompact(Bytes.toBytes(tableNameOrRegionName), Bytes.toBytes(columnFamily)); } @@ -1364,10 +1355,9 @@ public class HBaseAdmin implements Abortable, Closeable { * @param tableNameOrRegionName table or region to major compact * @param columnFamily column family within a table or region * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void majorCompact(final byte [] tableNameOrRegionName, - final byte[] columnFamily) throws IOException, InterruptedException { + final byte[] columnFamily) throws IOException { compact(tableNameOrRegionName, columnFamily, true); } @@ -1379,11 +1369,10 @@ public class HBaseAdmin implements Abortable, Closeable { * @param columnFamily column family within a table or region * @param major True if we are to do a major compaction. * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ private void compact(final byte [] tableNameOrRegionName, final byte[] columnFamily,final boolean major) - throws IOException, InterruptedException { + throws IOException { CatalogTracker ct = getCatalogTracker(); try { Pair regionServerPair @@ -1629,10 +1618,9 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to split * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void split(final String tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { split(Bytes.toBytes(tableNameOrRegionName)); } @@ -1642,15 +1630,14 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table to region to split * @throws IOException if a remote or network exception occurs - * @throws InterruptedException */ public void split(final byte [] tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { split(tableNameOrRegionName, null); } public void split(final String tableNameOrRegionName, - final String splitPoint) throws IOException, InterruptedException { + final String splitPoint) throws IOException { split(Bytes.toBytes(tableNameOrRegionName), Bytes.toBytes(splitPoint)); } @@ -1661,10 +1648,9 @@ public class HBaseAdmin implements Abortable, Closeable { * @param tableNameOrRegionName table to region to split * @param splitPoint the explicit position to split on * @throws IOException if a remote or network exception occurs - * @throws InterruptedException interrupt exception occurred */ public void split(final byte [] tableNameOrRegionName, - final byte [] splitPoint) throws IOException, InterruptedException { + final byte [] splitPoint) throws IOException { CatalogTracker ct = getCatalogTracker(); try { Pair regionServerPair @@ -1997,11 +1983,10 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to major compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException * @return the current compaction state */ public CompactionState getCompactionState(final String tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { return getCompactionState(Bytes.toBytes(tableNameOrRegionName)); } @@ -2011,11 +1996,10 @@ public class HBaseAdmin implements Abortable, Closeable { * * @param tableNameOrRegionName table or region to major compact * @throws IOException if a remote or network exception occurs - * @throws InterruptedException * @return the current compaction state */ public CompactionState getCompactionState(final byte [] tableNameOrRegionName) - throws IOException, InterruptedException { + throws IOException { CompactionState state = CompactionState.NONE; CatalogTracker ct = getCatalogTracker(); try { diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java index 79b3802..5ee15a0 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java @@ -89,12 +89,7 @@ public class MasterStatusServlet extends HttpServlet { } private ServerName getRootLocationOrNull(HMaster master) { - try { - return master.getCatalogTracker().getRootLocation(); - } catch (InterruptedException e) { - LOG.warn("Unable to get root location", e); - return null; - } + return master.getCatalogTracker().getRootLocation(); } private Map getFragmentationInfo( diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java index f46c870..99ff8b3 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java @@ -119,12 +119,10 @@ public class EnableTableHandler extends EventHandler { LOG.error("Error trying to enable the table " + this.tableNameStr, e); } catch (KeeperException e) { LOG.error("Error trying to enable the table " + this.tableNameStr, e); - } catch (InterruptedException e) { - LOG.error("Error trying to enable the table " + this.tableNameStr, e); } } - private void handleEnableTable() throws IOException, KeeperException, InterruptedException { + private void handleEnableTable() throws IOException, KeeperException { // I could check table is disabling and if so, not enable but require // that user first finish disabling but that might be obnoxious. diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java index 3441c14..9cbade0 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -556,8 +556,6 @@ public class ThriftServerRunner implements Runnable { public void compact(ByteBuffer tableNameOrRegionName) throws IOError { try{ getHBaseAdmin().compact(getBytes(tableNameOrRegionName)); - } catch (InterruptedException e) { - throw new IOError(e.getMessage()); } catch (IOException e) { LOG.warn(e.getMessage(), e); throw new IOError(e.getMessage()); @@ -568,9 +566,6 @@ public class ThriftServerRunner implements Runnable { public void majorCompact(ByteBuffer tableNameOrRegionName) throws IOError { try{ getHBaseAdmin().majorCompact(getBytes(tableNameOrRegionName)); - } catch (InterruptedException e) { - LOG.warn(e.getMessage(), e); - throw new IOError(e.getMessage()); } catch (IOException e) { LOG.warn(e.getMessage(), e); throw new IOError(e.getMessage()); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java index 0808912..0006765 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java @@ -57,9 +57,8 @@ public class RootRegionTracker extends ZooKeeperNodeTracker { /** * Gets the root region location, if available. Does not block. Sets a watcher. * @return server name or null if we failed to get the data. - * @throws InterruptedException */ - public ServerName getRootRegionLocation() throws InterruptedException { + public ServerName getRootRegionLocation() { try { return ServerName.parseFrom(super.getData(true)); } catch (DeserializationException e) { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java index f2a5fb3..3eda583 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java @@ -212,7 +212,7 @@ public class TestMetaReaderEditor { } @Test public void testGetRegionsCatalogTables() - throws IOException, InterruptedException { + throws IOException { List regions = MetaReader.getTableRegions(CT, HConstants.META_TABLE_NAME); assertTrue(regions.size() >= 1); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java index 81d406a..dfedd88 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java @@ -280,7 +280,7 @@ public class TestEndToEndSplitTransaction { table.flushCommits(); } - void flushAndBlockUntilDone(byte[] regionName) throws IOException, InterruptedException { + void flushAndBlockUntilDone(byte[] regionName) throws IOException { log("flushing region: " + Bytes.toStringBinary(regionName)); admin.flush(regionName); log("blocking until flush is complete: " + Bytes.toStringBinary(regionName));