Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1351903) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -634,6 +634,9 @@ checkIfBaseNodeAvailable(); ServerName sn = null; synchronized (this.masterLock) { + if (master != null && master.isMasterRunning()) { + return master; + } this.master = null; for (int tries = 0;