HBASE-3365 EOFE contacting crashed RS causes Master abort

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1049755 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-12-16 00:31:42 +00:00
parent 0957e3867a
commit 605ebb05ec
2 changed files with 6 additions and 0 deletions

View File

@ -784,6 +784,7 @@ Release 0.90.0 - Unreleased
HBASE-3359 LogRoller not added as a WAL listener when replication is enabled 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-3360 ReplicationLogCleaner is enabled by default in 0.90 -- causes NPE
HBASE-3363 ReplicationSink should batch delete HBASE-3363 ReplicationSink should batch delete
HBASE-3365 EOFE contacting crashed RS causes Master abort
IMPROVEMENTS IMPROVEMENTS

View File

@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import java.io.EOFException;
import java.net.ConnectException; import java.net.ConnectException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -1106,6 +1107,10 @@ public class AssignmentManager extends ZooKeeperListener {
LOG.info("Server " + server + " returned " + e.getMessage() + " for " + LOG.info("Server " + server + " returned " + e.getMessage() + " for " +
region.getEncodedName()); region.getEncodedName());
// Presume retry or server will expire. // 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) { } catch (RemoteException re) {
IOException ioe = re.unwrapRemoteException(); IOException ioe = re.unwrapRemoteException();
if (ioe instanceof NotServingRegionException) { if (ioe instanceof NotServingRegionException) {