svn commit: r634825 - /hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java

[st...@apache.org]

Author: stack
Date: Fri Mar  7 13:11:45 2008
New Revision: 634825

URL: http://svn.apache.org/viewvc?rev=634825&view=rev
Log:
HBASE-495 No server address listed in .META.
M    0.1/src/java/org/apache/hadoop/hbase/HMaster.java
    I was removing the lease I'd just made

Modified:
    hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java

Modified: hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java?rev=634825&r1=634824&r2=634825&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java (original)
+++ hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HMaster.java Fri Mar  7 13:11:45 2008
@@ -1266,29 +1266,20 @@
   @SuppressWarnings("unused")
   public HbaseMapWritable regionServerStartup(HServerInfo serverInfo)
   throws IOException {
-
     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.
-    long serverLabel = -1;
     if (!closed.get()) {
-      serverLabel = getServerLabel(s);
+      long serverLabel = getServerLabel(s);
       this.serverLeases.createLease(serverLabel, serverLabel,
         new ServerExpirer(s));
     }
-    // Now, in below, if an exception, clear the lease we just setup.
-    try {
-      registerRegionServer(s, serverInfo);
-      return createConfigurationSubset();
-    } finally {
-      if (serverLabel != -1) {
-        this.serverLeases.cancelLease(serverLabel, serverLabel);
-      }
-    }
+    registerRegionServer(s, serverInfo);
+    return createConfigurationSubset();
   }
-  
+
   /* Register the newly reporting regionserver with out local data structures
    * that keep up load, server address to server info, etc.
    * @param serverAddress