Index: src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1201589) +++ src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -92,7 +92,13 @@ this.pause = this.conf.getLong("hbase.client.pause", 1000); this.numRetries = this.conf.getInt("hbase.client.retries.number", 10); this.retryLongerMultiplier = this.conf.getInt("hbase.client.retries.longer.multiplier", 10); - this.connection.getMaster(); + try{ + this.connection.getMaster(); + }catch(MasterNotRunningException e){ + // we should delete connection between client and zookeeper + HConnectionManager.deleteConnection(this.conf, false); + throw e; + } } /**