hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1049755 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Thu, 16 Dec 2010 00:31:42 GMT
Author: stack
Date: Thu Dec 16 00:31:42 2010
New Revision: 1049755

URL: http://svn.apache.org/viewvc?rev=1049755&view=rev
Log:
HBASE-3365  EOFE contacting crashed RS causes 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=1049755&r1=1049754&r2=1049755&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Dec 16 00:31:42 2010
@@ -784,6 +784,7 @@ Release 0.90.0 - Unreleased
    HBASE-3359  LogRoller not added as a WAL listener when replication is enabled
    HBASE-3360  ReplicationLogCleaner is enabled by default in 0.90 -- causes NPE
    HBASE-3363  ReplicationSink should batch delete
+   HBASE-3365  EOFE contacting crashed RS causes Master abort
 
 
   IMPROVEMENTS

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=1049755&r1=1049754&r2=1049755&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 Thu Dec
16 00:31:42 2010
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.io.EOFException;
 import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -1106,6 +1107,10 @@ public class AssignmentManager extends Z
       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 " +
+        region.getEncodedName());
+      // Presume retry or server will expire.
     } catch (RemoteException re) {
       IOException ioe = re.unwrapRemoteException();
       if (ioe instanceof NotServingRegionException) {



Mime
View raw message