You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/03/24 22:15:40 UTC
svn commit: r1304924 - in
/hbase/trunk/src/main/java/org/apache/hadoop/hbase: HConstants.java
zookeeper/ZKConfig.java
Author: stack
Date: Sat Mar 24 21:15:40 2012
New Revision: 1304924
URL: http://svn.apache.org/viewvc?rev=1304924&view=rev
Log:
HBASE-5633 NPE reading ZK config in HBase
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1304924&r1=1304923&r2=1304924&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java Sat Mar 24 21:15:40 2012
@@ -82,6 +82,9 @@ public final class HConstants {
/** Cluster is fully-distributed */
public static final String CLUSTER_IS_DISTRIBUTED = "true";
+ /** Default value for cluster distributed mode */
+ public static final String DEFAULT_CLUSTER_DISTRIBUTED = CLUSTER_IS_LOCAL;
+
/** default host address */
public static final String DEFAULT_HOST = "0.0.0.0";
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java?rev=1304924&r1=1304923&r2=1304924&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java Sat Mar 24 21:15:40 2012
@@ -163,7 +163,8 @@ public class ZKConfig {
}
// Special case for 'hbase.cluster.distributed' property being 'true'
if (key.startsWith("server.")) {
- if (conf.get(HConstants.CLUSTER_DISTRIBUTED).equals(HConstants.CLUSTER_IS_DISTRIBUTED)
+ if (conf.get(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED).
+ equals(HConstants.CLUSTER_IS_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. " +