commit a4ab13f8ab73bba3eedd18433cc15b5dfb7ecbfc Author: Todd Lipcon Date: Thu Mar 17 13:19:36 2011 -0700 HBASE-3666. TestScannerTimeout fails occasionally Reason: bug fix for race in scanner.next while server is shutting down Author: Todd Lipcon Ref: CDH-2836 diff --git src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index b9e9a7e..119b006 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1813,7 +1813,12 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, } 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);