HBASE-6432 HRegionServer doesn't properly set clusterId in conf

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1381907 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

@@ -150,6 +150,7 @@
 import org.apache.hadoop.hbase.util.Strings;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.util.VersionInfo;
+import org.apache.hadoop.hbase.zookeeper.ClusterId;
 import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker;
 import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperNodeTracker;
@@ -353,6 +354,11 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
    */
   private ObjectName mxBean = null;
 
+  /**
+   * ClusterId
+   */
+  private ClusterId clusterId = null;
+
   /**
    * Starts a HRegionServer at the default location
    *
@@ -552,6 +558,12 @@ public Integer apply(Writable from) {
   private void preRegistrationInitialization(){
     try {
       initializeZooKeeper();
+
+      clusterId = new ClusterId(zooKeeper, this);
+      if(clusterId.hasId()) {
+        conf.set(HConstants.CLUSTER_ID, clusterId.getId());
+      }
+
       initializeThreads();
       int nbBlocks = conf.getInt("hbase.regionserver.nbreservationblocks", 4);
       for (int i = 0; i < nbBlocks; i++) {