Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1003508) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -330,7 +330,8 @@ try { this.masterLock.wait(getPauseTime(tries)); } catch (InterruptedException e) { - // continue + Thread.currentThread().interrupt(); + throw new RuntimeException("Thread was interrupted while trying to connect to master."); } } this.masterChecked = true; @@ -723,8 +724,9 @@ } try{ Thread.sleep(getPauseTime(tries)); - } catch (InterruptedException e){ - // continue + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("Giving up trying to location region in meta: thread is interrupted."); } } } @@ -911,7 +913,7 @@ * * If ZK has not been initialized yet, this will connect to ZK. * @returns zookeeper reference - * @throws ZooKeeperConncetionException if there's a problem connecting to zk + * @throws ZooKeeperConnectionException if there's a problem connecting to zk */ public synchronized ZooKeeperWatcher getZooKeeperWatcher() throws ZooKeeperConnectionException { @@ -943,7 +945,8 @@ try { Thread.sleep(getPauseTime(tries)); } catch (InterruptedException e) { - // continue + Thread.currentThread().interrupt(); + throw new IOException("Giving up trying to get region server: thread is interrupted."); } } return null;