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 2011/08/10 23:45:57 UTC

svn commit: r1156378 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java

Author: stack
Date: Wed Aug 10 21:45:56 2011
New Revision: 1156378

URL: http://svn.apache.org/viewvc?rev=1156378&view=rev
Log:
HBASE-4168 A client continues to try and connect to a powered down regionserver

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1156378&r1=1156377&r2=1156378&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Aug 10 21:45:56 2011
@@ -200,7 +200,6 @@ Release 0.91.0 - Unreleased
    HBASE-4184  CatalogJanitor doesn't work properly when "fs.default.name" isn't
                set in config file (Ming Ma)
 
-
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
    HBASE-3292  Expose block cache hit/miss/evict counts into region server
@@ -428,8 +427,10 @@ Release 0.90.5 - Unreleased
   BUG FIXES
    HBASE-4160  HBase shell move and online may be unusable if region name
                or server includes binary-encoded data (Jonathan Hsieh)
+   HBASE-4168  A client continues to try and connect to a powered down
+               regionserver (Anirudh Todi)
 
-Release 0.90.4 - Unreleased
+Release 0.90.4 - August 10, 2011
 
   BUG FIXES
    HBASE-3878  Hbase client throws NoSuchElementException (Ted Yu)

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1156378&r1=1156377&r2=1156378&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Wed Aug 10 21:45:56 2011
@@ -457,11 +457,7 @@ public class CatalogTracker {
       t = e;
     } catch (RemoteException e) {
       IOException ioe = e.unwrapRemoteException();
-      if (ioe instanceof NotServingRegionException) {
-        t = ioe;
-      } else {
-        throw e;
-      }
+      t = ioe;
     } catch (IOException e) {
       Throwable cause = e.getCause();
       if (cause != null && cause instanceof EOFException) {
@@ -470,7 +466,7 @@ public class CatalogTracker {
           && cause.getMessage().contains("Connection reset")) {
         t = cause;
       } else {
-        throw e;
+        t = e;
       }
     }
     LOG.info("Failed verification of " + Bytes.toStringBinary(regionName) +