Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1524942) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -807,6 +807,8 @@ } try { + // Set our ephemeral znode up in zookeeper now we have a name. + createMyEphemeralNode(); // Try and register with the Master; tell it we are here. Break if // server is stopped or the clusterup flag is down or hdfs went wacky. while (keepLooping()) { @@ -1187,8 +1189,6 @@ this.conf.set("mapred.task.id", "hb_rs_" + this.serverNameFromMasterPOV.toString()); } - // Set our ephemeral znode up in zookeeper now we have a name. - createMyEphemeralNode(); // Save it in a file, this will allow to see if we crash ZNodeClearer.writeMyEphemeralNodeOnDisk(getMyEphemeralNodePath());