From f4ecac880595c263028fbf949fe763d2ba1cf958 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Fri, 16 Aug 2013 10:15:57 -0700 Subject: [PATCH] Make sure lease time isn't ever negative. --- .../src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java index 190ed9d..ba31f28 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java @@ -56,6 +56,7 @@ import java.io.IOException; @InterfaceAudience.Private public class Leases extends HasThread { private static final Log LOG = LogFactory.getLog(Leases.class.getName()); + public static final int MIN_WAIT_TIME = 100; private final Map leases = new ConcurrentHashMap(); protected final int leaseCheckFrequency; @@ -87,7 +88,10 @@ public class Leases extends HasThread { if (nextLease != null) { toWait = nextLease.getDelay(TimeUnit.MILLISECONDS); } + toWait = Math.min(leaseCheckFrequency, toWait); + toWait = Math.max(MIN_WAIT_TIME, toWait); + Thread.sleep(toWait); } catch (InterruptedException e) { continue; -- 1.7.10.2 (Apple Git-33)