svn commit: r1054838 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[stack]

Author: stack
Date: Tue Jan  4 00:11:27 2011
New Revision: 1054838

URL: http://svn.apache.org/viewvc?rev=1054838&view=rev
Log:
HBASE-3344 Master aborts after RPC to server that was shutting down

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=1054838&r1=1054837&r2=1054838&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Jan  4 00:11:27 2011
@@ -771,6 +771,7 @@ Release 0.90.0 - Unreleased
                doing rolling-restart.sh
    HBASE-3383  [0.90RC1] bin/hbase script displays "no such file" warning on
                target/cached_classpath.txt
+   HBASE-3344  Master aborts after RPC to server that was shutting down
 
 
   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=1054838&r1=1054837&r2=1054838&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
 Tue Jan  4 00:11:27 2011
@@ -1122,6 +1122,10 @@ public class AssignmentManager extends Z
         // 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);
       }