Index: src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java (revision 1306778) +++ src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java (working copy) @@ -436,8 +436,7 @@ * @return True if a 'local' address in hbase.master value. */ public static boolean isLocal(final Configuration c) { - final String mode = c.get(HConstants.CLUSTER_DISTRIBUTED); - return mode == null || mode.equals(HConstants.CLUSTER_IS_LOCAL); + return(!c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED)); } /** Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (revision 1306778) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (working copy) @@ -163,8 +163,7 @@ } // Special case for 'hbase.cluster.distributed' property being 'true' if (key.startsWith("server.")) { - if (conf.get(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED). - equals(HConstants.CLUSTER_IS_DISTRIBUTED) + if (conf.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED) && value.startsWith(HConstants.LOCALHOST)) { String msg = "The server in zoo.cfg cannot be set to localhost " + "in a fully-distributed setup because it won't be reachable. " + Index: src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1306778) +++ src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -77,13 +77,13 @@ public static final String HBASE_MASTER_LOADBALANCER_CLASS = "hbase.master.loadbalancer.class"; /** Cluster is standalone or pseudo-distributed */ - public static final String CLUSTER_IS_LOCAL = "false"; + public static final boolean CLUSTER_IS_LOCAL = false; /** Cluster is fully-distributed */ - public static final String CLUSTER_IS_DISTRIBUTED = "true"; + public static final boolean CLUSTER_IS_DISTRIBUTED = true; /** Default value for cluster distributed mode */ - public static final String DEFAULT_CLUSTER_DISTRIBUTED = CLUSTER_IS_LOCAL; + public static final boolean DEFAULT_CLUSTER_DISTRIBUTED = CLUSTER_IS_LOCAL; /** default host address */ public static final String DEFAULT_HOST = "0.0.0.0";