HBASE-495 No server address listed in .META.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@634791 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -32,6 +32,7 @@ Hbase Change Log
    HBASE-492   hbase TRUNK does not build against hadoop TRUNK
    HBASE-496   impossible state for createLease writes 400k lines in about 15mins
    HBASE-472   Passing on edits, we dump all to log
+   HBASE-495   No server address listed in .META.
    
   IMPROVEMENTS
    HBASE-415   Rewrite leases to use DelayedBlockingQueue instead of polling

src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java

@@ -20,25 +20,23 @@
 package org.apache.hadoop.hbase.master;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.HashMap;
-import java.util.SortedMap;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.SortedMap;
 
-import org.apache.hadoop.hbase.HServerAddress;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HServerInfo;
 import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.io.Text;
+import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.io.HbaseMapWritable;
+import org.apache.hadoop.hbase.HServerInfo;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
-import org.apache.hadoop.hbase.util.Writables;
+import org.apache.hadoop.hbase.io.HbaseMapWritable;
-
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
-import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HLog;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Writables;
+import org.apache.hadoop.io.Text;
 
 /** 
  * Instantiated when a server's lease has expired, meaning it has crashed.
@@ -131,10 +129,6 @@ class ProcessServerShutdown extends RegionServerOperation {
         if (serverName.length() > 0 &&
             deadServerName.compareTo(serverName) != 0) {
           // This isn't the server you're looking for - move along
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("Server name " + serverName + " is not same as " +
-                deadServerName + ": Passing");
-          }
           continue;
         }
 
@@ -143,9 +137,6 @@ class ProcessServerShutdown extends RegionServerOperation {
         if (info == null) {
           continue;
         }
-        LOG.info(info.getRegionName() + " was on shutdown server <" +
-            serverName + "> (or server is null). Marking unassigned in " +
-        "meta and clearing pendingRegions");
 
         if (info.isMetaTable()) {
           if (LOG.isDebugEnabled()) {

src/java/org/apache/hadoop/hbase/master/ServerManager.java

@@ -80,7 +80,12 @@ class ServerManager implements HConstants {
   public void regionServerStartup(HServerInfo serverInfo) {
     String s = serverInfo.getServerAddress().toString().trim();
     LOG.info("received start message from: " + s);
-
+    // Do the lease check up here. There might already be one out on this
+    // server expecially if it just shutdown and came back up near-immediately
+    // after.
+    if (!master.closed.get()) {
+      serverLeases.createLease(s, new ServerExpirer(s));
+    }
     HServerLoad load = serversToLoad.remove(s);
     if (load != null) {
       // The startup message was from a known server.
@@ -114,10 +119,6 @@ class ServerManager implements HConstants {
     }
     servers.add(s);
     loadToServers.put(load, servers);
-
-    if (!master.closed.get()) {
-      serverLeases.createLease(s, new ServerExpirer(s));
-    }
   }
   
   /** {@inheritDoc} */