Index: src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1206441) +++ src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -116,10 +116,14 @@ Thread.sleep(getPauseTime(tries)); } catch (InterruptedException e) { Thread.currentThread().interrupt(); + // we should delete connection between client and zookeeper + HConnectionManager.deleteStaleConnection(this.connection); throw new MasterNotRunningException("Interrupted"); } } if (tries >= numRetries) { + // we should delete connection between client and zookeeper + HConnectionManager.deleteStaleConnection(this.connection); throw new MasterNotRunningException("Retried " + numRetries + " times"); } }