From 7bb6f3839c8837f009d4dc0552d41a7b266654d2 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 1 Oct 2010 20:44:36 +0000
Subject: [PATCH] HBASE-3066 We don't put the port for hregionserver up into
 znode since new master

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1003644 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                   |  2 ++
 .../hbase/regionserver/HRegionServer.java     | 33 ++++++-------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d0b2f2519b..b1acdbde69a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -959,6 +959,8 @@ Release 0.21.0 - Unreleased
    HBASE-2646  Compaction requests should be prioritized to prevent blocking
                (Jeff Whiting via Stack)
    HBASE-3019  Make bulk assignment on cluster startup run faster
+   HBASE-3066  We don't put the port for hregionserver up into znode since
+               new master
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index e80ece8db29..ee0694bac9c 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -240,17 +240,10 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
 
   private final long rpcTimeout;
 
-  // Address passed in to constructor. This is not always the address we run
-  // with. For example, if passed port is 0, then we are to pick a port. The
-  // actual address we run with is in the #serverInfo data member.
-  private final HServerAddress address;
-
   // The main region server thread.
   @SuppressWarnings("unused")
   private Thread regionServerThread;
 
-  private final String machineName;
-
   // Instance of the hbase executor service.
   private ExecutorService service;
 
@@ -265,19 +258,6 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
    * @throws InterruptedException 
    */
   public HRegionServer(Configuration conf) throws IOException, InterruptedException {
-    this.machineName = DNS.getDefaultHost(conf.get(
-        "hbase.regionserver.dns.interface", "default"), conf.get(
-        "hbase.regionserver.dns.nameserver", "default"));
-    String addressStr = machineName
-        + ":"
-        + conf.get(HConstants.REGIONSERVER_PORT, Integer
-            .toString(HConstants.DEFAULT_REGIONSERVER_PORT));
-    // This is not necessarily the address we will run with. The address we
-    // use will be in #serverInfo data member. For example, we may have been
-    // passed a port of 0 which means we should pick some ephemeral port to bind
-    // to.
-    this.address = new HServerAddress(addressStr);
-
     this.fsOk = true;
     this.conf = conf;
     this.connection = HConnectionManager.getConnection(conf);
@@ -397,6 +377,13 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
     this.stopped = false;
 
     // Server to handle client requests
+    String machineName = DNS.getDefaultHost(conf.get(
+        "hbase.regionserver.dns.interface", "default"), conf.get(
+        "hbase.regionserver.dns.nameserver", "default"));
+    String addressStr = machineName + ":" +
+      conf.get(HConstants.REGIONSERVER_PORT,
+        Integer.toString(HConstants.DEFAULT_REGIONSERVER_PORT));
+    HServerAddress address = new HServerAddress(addressStr);
     this.server = HBaseRPC.getServer(this,
         new Class<?>[]{HRegionInterface.class, HBaseRPCErrorHandler.class,
         OnlineRegions.class},
@@ -407,8 +394,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
     this.server.setErrorHandler(this);
     this.server.setQosFunction(new QosFunction());
 
-    // Address is giving a default IP for the moment. Will be changed after
-    // calling the master.
+    // HServerInfo can be amended by master.  See below in reportForDuty.
     this.serverInfo = new HServerInfo(new HServerAddress(new InetSocketAddress(
         address.getBindAddress(), this.server.getListenerAddress().getPort())),
         System.currentTimeMillis(), this.conf.getInt(
@@ -1373,7 +1359,8 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
         this.requestCount.set(0);
         lastMsg = System.currentTimeMillis();
         ZKUtil.setAddressAndWatch(zooKeeper, ZKUtil.joinZNode(
-            zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)), address);
+            zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)),
+            this.serverInfo.getServerAddress());
         this.serverInfo.setLoad(buildServerLoad());
         result = this.hbaseMaster.regionServerStartup(this.serverInfo);
         break;