svn commit: r1102403 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[st...@apache.org]

Author: stack
Date: Thu May 12 18:06:02 2011
New Revision: 1102403

URL: http://svn.apache.org/viewvc?rev=1102403&view=rev
Log:
HBASE-3617 NoRouteToHostException during balancing will cause Master abort

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1102403&r1=1102402&r2=1102403&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu May 12 18:06:02 2011
@@ -1,4 +1,9 @@
 HBase Change Log
+Release 0.90.4 - Unreleased
+  BUG FIXES
+    HBASE-3617 NoRouteToHostException during balancing will cause Master abort
+               (Ted Yu)
+
 Release 0.90.3 - Unreleased
   BUG FIXES
    HBASE-3712  HTable.close() doesn't shutdown thread pool

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1102403&r1=1102402&r2=1102403&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Thu May 12 18:06:02 2011
@@ -1118,8 +1118,6 @@ public class AssignmentManager extends Z
       server = regions.get(region);
     }
     try {
-      // TODO: We should consider making this look more like it does for the
-      // region open where we catch all throwables and never abort
       if (serverManager.sendRegionClose(server, state.getRegion())) {
         LOG.debug("Sent CLOSE to " + server + " for region " +
           region.getRegionNameAsString());
@@ -1135,36 +1133,13 @@ public class AssignmentManager extends Z
       // Presume that the split message when it comes in will fix up the master's
       // in memory cluster state.
       return;
-    } catch (ConnectException e) {
-      LOG.info("Failed connect to " + server + ", message=" + e.getMessage() +
-        ", region=" + region.getEncodedName());
-      // Presume that regionserver just failed and we haven't got expired
-      // server from zk yet.  Let expired server deal with clean up.
-    } catch (java.net.SocketTimeoutException e) {
-      LOG.info("Server " + server + " returned " + e.getMessage() + " for " +
-        region.getEncodedName());
-      // Presume retry or server will expire.
-    } catch (EOFException e) {
-      LOG.info("Server " + server + " returned " + e.getMessage() + " for " +
+    } catch (Throwable t) {
+      if (t instanceof RemoteException) {
+        t = ((RemoteException)t).unwrapRemoteException();
+      }
+      LOG.info("Server " + server + " returned " + t + " for " +
         region.getEncodedName());
       // Presume retry or server will expire.
-    } catch (RemoteException re) {
-      IOException ioe = re.unwrapRemoteException();
-      if (ioe instanceof NotServingRegionException) {
-        // Failed to close, so pass through and reassign
-        LOG.debug("Server " + server + " returned " + ioe + " for " +
-          region.getEncodedName());
-      } else if (ioe instanceof EOFException) {
-        // Failed to close, so pass through and reassign
-        LOG.debug("Server " + server + " returned " + ioe + " for " +
-          region.getEncodedName());
-      } else {
-        this.master.abort("Remote unexpected exception", ioe);
-      }
-    } catch (Throwable t) {
-      // For now call abort if unexpected exception -- radical, but will get
-      // fellas attention. St.Ack 20101012
-      this.master.abort("Remote unexpected exception", t);
     }
   }