svn commit: r1085123 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[st...@apache.org]

Author: stack
Date: Thu Mar 24 20:40:13 2011
New Revision: 1085123

URL: http://svn.apache.org/viewvc?rev=1085123&view=rev
Log:
HBASE-3666 TestScannerTimeout fails occasionally

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1085123&r1=1085122&r2=1085123&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Mar 24 20:40:13 2011
@@ -173,6 +173,7 @@ Release 0.90.2 - Unreleased
                such as -ROOT- or .META.
    HBASE-3654  Weird blocking between getOnlineRegion and createRegionLoad
                (Subbu M Iyer via Stack)
+   HBASE-3666  TestScannerTimeout fails occasionally
 
   IMPROVEMENTS
    HBASE-3542  MultiGet methods in Thrift

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1085123&r1=1085122&r2=1085123&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Mar 24 20:40:13 2011
@@ -1906,7 +1906,12 @@ public class HRegionServer implements HR
       } catch (IOException e) {
         // If checkOpen failed, server not running or filesystem gone,
         // cancel this lease; filesystem is gone or we're closing or something.
-        this.leases.cancelLease(scannerName);
+        try {
+          this.leases.cancelLease(scannerName);
+        } catch (LeaseException le) {
+          LOG.info("Server shutting down and client tried to access missing scanner " +
+            scannerName);
+        }
         throw e;
       }
       this.leases.renewLease(scannerName);