hbase.master from 'local' to 'localhost:PORT' in
- * passed Configuration instance.
- * @param c
- * @return The passed c configuration modified if hbase.master
- * value was 'local' otherwise, unaltered.
- */
- private static HBaseConfiguration doLocal(final HBaseConfiguration c) {
- if (!isLocal(c)) {
- return c;
- }
-
- // Need to rewrite address in Configuration if not done already.
- String address = c.get(MASTER_ADDRESS);
- if (address != null) {
- String port = address.startsWith(LOCAL_COLON)?
- address.substring(LOCAL_COLON.length()):
- Integer.toString(DEFAULT_MASTER_PORT);
- c.set(MASTER_ADDRESS, "localhost:" + port);
- }
-
- // Need to rewrite host in Configuration if not done already.
- String host = c.get(MASTER_HOST_NAME);
- if (host != null && host.equals(LOCAL)) {
- c.set(MASTER_HOST_NAME, "localhost");
- }
-
- return c;
- }
-
/**
* @param c Configuration to check.
* @return True if a 'local' address in hbase.master value.
*/
public static boolean isLocal(final Configuration c) {
- String address = c.get(MASTER_ADDRESS);
- boolean addressIsLocal = address == null || address.equals(LOCAL) ||
- address.startsWith(LOCAL_COLON);
- String host = c.get(MASTER_HOST_NAME);
- boolean hostIsLocal = host == null || host.equals(LOCAL);
- return addressIsLocal && hostIsLocal;
+ String mode = c.get(CLUSTER_DISTRIBUTED);
+ return mode == null || mode.equals(CLUSTER_IS_LOCAL);
}
/**
diff --git a/src/java/org/apache/hadoop/hbase/master/HMaster.java b/src/java/org/apache/hadoop/hbase/master/HMaster.java
index 6e8c613e4fa..54c0ccb042e 100644
--- a/src/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -85,6 +85,7 @@ import org.apache.hadoop.io.MapWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.net.DNS;
import org.apache.hadoop.util.StringUtils;
/**
@@ -161,17 +162,12 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
* @throws IOException
*/
public HMaster(HBaseConfiguration conf) throws IOException {
- // find out our address. If it's set in config, use that, otherwise look it
- // up in DNS.
- String addressStr = conf.get(MASTER_ADDRESS);
- if (addressStr == null) {
- addressStr = conf.get(MASTER_HOST_NAME);
- if (addressStr == null) {
- addressStr = InetAddress.getLocalHost().getCanonicalHostName();
- }
- addressStr += ":";
- addressStr += conf.get("hbase.master.port", Integer.toString(DEFAULT_MASTER_PORT));
- }
+ // find out our address up in DNS.
+ String addressStr = DNS.getDefaultHost(
+ conf.get("hbase.master.dns.interface","default"),
+ conf.get("hbase.master.dns.nameserver","default"));
+ addressStr += ":" +
+ conf.get("hbase.master.port", Integer.toString(DEFAULT_MASTER_PORT));
HServerAddress address = new HServerAddress(addressStr);
LOG.info("My address is " + address);
@@ -531,7 +527,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
this.connection.getHRegionConnection(address, false);
HServerInfo info = hri.getHServerInfo();
LOG.debug("Inspection found server " + info.getName());
- serverManager.recordNewServer(info);
+ serverManager.recordNewServer(info, true);
HRegionInfo[] regions = hri.getRegionsAssignment();
for (HRegionInfo region : regions) {
if(region.isRootRegion()) {
@@ -1075,13 +1071,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
// Process command-line args. TODO: Better cmd-line processing
// (but hopefully something not as painful as cli options).
-
- final String addressArgKey = "--bind=";
for (String cmd: args) {
- if (cmd.startsWith(addressArgKey)) {
- conf.set(MASTER_ADDRESS, cmd.substring(addressArgKey.length()));
- continue;
- }
if (cmd.equals("start")) {
try {
diff --git a/src/java/org/apache/hadoop/hbase/master/ServerManager.java b/src/java/org/apache/hadoop/hbase/master/ServerManager.java
index ff43a4f7007..bd462f49b5e 100644
--- a/src/java/org/apache/hadoop/hbase/master/ServerManager.java
+++ b/src/java/org/apache/hadoop/hbase/master/ServerManager.java
@@ -194,12 +194,23 @@ class ServerManager implements HConstants {
recordNewServer(info);
}
+
/**
- * Adds the HSI to the RS list
+ * Adds the HSI to the RS list and creates an empty load
* @param info The region server informations
*/
public void recordNewServer(HServerInfo info) {
- HServerLoad load = new HServerLoad();
+ recordNewServer(info, false);
+ }
+
+ /**
+ * Adds the HSI to the RS list
+ * @param info The region server informations
+ * @param useInfoLoad True if the load from the info should be used
+ * like under a master failover
+ */
+ public void recordNewServer(HServerInfo info, boolean useInfoLoad) {
+ HServerLoad load = useInfoLoad ? info.getLoad() : new HServerLoad();
String serverName = HServerInfo.getServerName(info);
info.setLoad(load);
// We must set this watcher here because it can be set on a fresh start
diff --git a/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java b/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
index 9d17b36f0b1..165e128da60 100644
--- a/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
+++ b/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
@@ -101,6 +101,7 @@ public class HQuorumPeer implements HConstants {
}
for (EntryDistributed mode requires an instance of the Hadoop Distributed File System (DFS) and a ZooKeeper cluster. +
Distributed mode requires an instance of the Hadoop Distributed File System (DFS). See the Hadoop requirements and instructions for how to set up a DFS. -See the ZooKeeeper Getting Started Guide -for information about the ZooKeeper distributed coordination service. -If you do not configure a ZooKeeper cluster, HBase will manage a single instance -ZooKeeper service for you running on the master node. -This is intended for development and local testing only. -It SHOULD NOT be used in a fully-distributed production operation.
hbase-site.xml, you must also configure
-hbase.master.hostname to the host on which the HBase master runs
-(read
-about the HBase master, regionservers, etc).
-For example, adding the below to your hbase-site.xml says the
-master is up on the host example.org:
+hbase.cluster.distributed to 'true'.
<configuration>
...
<property>
- <name>hbase.master.hostname</name>
- <value>example.org</value>
- <description>The host that the HBase master runs at.
- A value of 'local' runs the master and regionserver in a single process.
+ <name>hbase.cluster.distributed</name>
+ <value>true</value>
+ <description>The mode the cluster will be in. Possible values are
+ false: standalone and pseudo-distributed setups with managed Zookeeper
+ true: fully-distributed with unmanaged Zookeeper Quorum (see hbase-env.sh)
</description>
</property>
...
@@ -151,14 +143,35 @@ operation requires that you also modify ${HBASE_HOME}/conf/regionservers${HADOOP_HOME}/conf/slaves).
-Furthermore, you should configure a distributed ZooKeeper cluster.
+Furthermore, you have to configure a distributed ZooKeeper cluster.
The ZooKeeper configuration file is stored at ${HBASE_HOME}/conf/zoo.cfg.
See the ZooKeeper Getting Started Guide for information about the format and options of that file.
Specifically, look at the Running Replicated ZooKeeper section.
-In ${HBASE_HOME}/conf/hbase-env.sh, set HBASE_MANAGES_ZK=false to tell HBase not to manage its own single instance ZooKeeper service.
+In ${HBASE_HOME}/conf/hbase-env.sh, set the following to tell HBase not to manage its own single instance of ZooKeeper.
+
+ ...
+# Tell HBase whether it should manage it's own instance of Zookeeper or not.
+export HBASE_MANAGES_ZK=false
+
+
+
+It's still possible to use HBase in order to start a single Zookeeper instance in fully-distributed operation.
+The first thing to do is still to change ${HBASE_HOME}/conf/zoo.cfg and set a single node.
+Note that leaving the value "localhost" will make it impossible to start HBase.
+
+ ...
+server.0=example.org:2888:3888
+
+Then on the example.org server do the following before running HBase.
+
+${HBASE_HOME}/bin/hbase-daemon.sh start zookeeper
+
+Be aware that this option is only recommanded for testing purposes as a failure
+on that node would render HBase unusable.
-Of note, if you have made HDFS client configuration on your hadoop cluster, hbase will not
+
+
Of note, if you have made HDFS client configuration on your hadoop cluster, HBase will not
see this configuration unless you do one of the following:
HADOOP_CONF_DIR to CLASSPATH in hbase-env.shdfs.replication. If for example,
you want to run with a replication factor of 5, hbase will create files with the default of 3 unless
-you do the above to make the configuration available to hbase.
+you do the above to make the configuration available to HBase.