Index: src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (revision 1048931) +++ src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java (working copy) @@ -157,6 +157,9 @@ private int stopMaster() { HBaseAdmin adm = null; try { + Configuration conf = getConf(); + // Don't try more than once + conf.setInt("hbase.client.retries.number", 1); adm = new HBaseAdmin(getConf()); } catch (MasterNotRunningException e) { LOG.error("Master not running");