You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/12/16 01:33:00 UTC
svn commit: r1049756 - in /hbase/branches/0.90: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Author: stack
Date: Thu Dec 16 00:33:00 2010
New Revision: 1049756
URL: http://svn.apache.org/viewvc?rev=1049756&view=rev
Log:
HBASE-3365 EOFE contacting crashed RS causes 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=1049756&r1=1049755&r2=1049756&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Dec 16 00:33:00 2010
@@ -751,6 +751,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/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=1049756&r1=1049755&r2=1049756&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 Dec 16 00:33:00 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) {