svn commit: r1084375 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[st...@apache.org]

Author: stack
Date: Tue Mar 22 22:16:55 2011
New Revision: 1084375

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

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1084375&r1=1084374&r2=1084375&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Mar 22 22:16:55 2011
@@ -159,6 +159,8 @@ Release 0.90.2 - Unreleased
                holding lock on RIT; a big no-no (Ted Yu via Stack)
    HBASE-3575  Update rename table script
    HBASE-3687  Bulk assign on startup should handle a ServerNotRunningException
+   HBASE-3617  NoRouteToHostException during balancing will cause Master abort
+               (Ted Yu via Stack)
 
   IMPROVEMENTS
    HBASE-3542  MultiGet methods in Thrift

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1084375&r1=1084374&r2=1084375&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Mar 22 22:16:55 2011
@@ -1276,36 +1276,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);
     }
   }