From 605ebb05ec99c26013f29043bc65057d649a7544 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 16 Dec 2010 00:31:42 +0000
Subject: [PATCH] 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
---
 CHANGES.txt                                                  | 1 +
 .../org/apache/hadoop/hbase/master/AssignmentManager.java    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7bf2db7a5a0..be164e9febe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 6f04a0e0d50..ea064f2e80b 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -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 ZooKeeperListener {
       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) {