You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/06/27 06:59:28 UTC
svn commit: r1354325 - in /hbase/trunk:
hbase-common/src/main/java/org/apache/hadoop/hbase/
hbase-server/src/main/java/org/apache/hadoop/hbase/client/
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/
hbase-server/src/test/java/org/apach...
Author: tedyu
Date: Wed Jun 27 04:59:27 2012
New Revision: 1354325
URL: http://svn.apache.org/viewvc?rev=1354325&view=rev
Log:
HBASE-6170 Timeouts for row lock and scan should be separate (Chris Trezzo)
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java Wed Jun 27 04:59:27 2012
@@ -536,16 +536,25 @@ public final class HConstants {
public static String HBASE_CLIENT_INSTANCE_ID = "hbase.client.instance.id";
/**
- * HRegion server lease period in milliseconds. Clients must report in within this period
- * else they are considered dead. Unit measured in ms (milliseconds).
+ * The row lock timeout period in milliseconds.
*/
- public static String HBASE_REGIONSERVER_LEASE_PERIOD_KEY =
- "hbase.regionserver.lease.period";
+ public static String HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD =
+ "hbase.regionserver.rowlock.timeout.period";
/**
- * Default value of {@link #HBASE_REGIONSERVER_LEASE_PERIOD_KEY}.
+ * Default value of {@link #HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD}.
*/
- public static long DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD = 60000;
+ public static int DEFAULT_HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD = 60000;
+
+ /**
+ * The client scanner timeout period in milliseconds.
+ */
+ public static String HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD = "hbase.client.scanner.timeout.period";
+
+ /**
+ * Default value of {@link #HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD}.
+ */
+ public static int DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD = 60000;
/**
* timeout for each RPC
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java Wed Jun 27 04:59:27 2012
@@ -106,9 +106,8 @@ public class ClientScanner extends Abstr
HConstants.HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE_KEY,
HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE);
}
- this.scannerTimeout = (int) conf.getLong(
- HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
- HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD);
+ this.scannerTimeout = conf.getInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
+ HConstants.DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD);
// check if application wants to collect scan metrics
byte[] enableMetrics = scan.getAttribute(
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jun 27 04:59:27 2012
@@ -422,6 +422,16 @@ public class HRegionServer implements C
*/
private MovedRegionsCleaner movedRegionsCleaner;
+ /**
+ * The lease timeout period for row locks (milliseconds).
+ */
+ private final int rowLockLeaseTimeoutPeriod;
+
+ /**
+ * The lease timeout period for client scanners (milliseconds).
+ */
+ private final int scannerLeaseTimeoutPeriod;
+
/**
* Starts a HRegionServer at the default location
@@ -466,6 +476,13 @@ public class HRegionServer implements C
this.abortRequested = false;
this.stopped = false;
+ this.rowLockLeaseTimeoutPeriod = conf.getInt(
+ HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD,
+ HConstants.DEFAULT_HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD);
+
+ this.scannerLeaseTimeoutPeriod = conf.getInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
+ HConstants.DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD);
+
// Server to handle client requests.
String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
conf.get("hbase.regionserver.dns.interface", "default"),
@@ -705,10 +722,7 @@ public class HRegionServer implements C
this.compactionChecker = new CompactionChecker(this,
this.threadWakeFrequency * multiplier, this);
- this.leases = new Leases((int) conf.getLong(
- HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
- HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD),
- this.threadWakeFrequency);
+ this.leases = new Leases(this.threadWakeFrequency);
// Create the thread for the ThriftServer.
if (conf.getBoolean("hbase.regionserver.export.thrift", false)) {
@@ -2658,7 +2672,8 @@ public class HRegionServer implements C
long lockId = nextLong();
String lockName = String.valueOf(lockId);
rowlocks.put(lockName, r);
- this.leases.createLease(lockName, new RowLockListener(lockName, region));
+ this.leases.createLease(lockName, this.rowLockLeaseTimeoutPeriod, new RowLockListener(lockName,
+ region));
return lockId;
}
@@ -2666,7 +2681,8 @@ public class HRegionServer implements C
long scannerId = nextLong();
String scannerName = String.valueOf(scannerId);
scanners.put(scannerName, s);
- this.leases.createLease(scannerName, new ScannerListener(scannerName));
+ this.leases.createLease(scannerName, this.scannerLeaseTimeoutPeriod, new ScannerListener(
+ scannerName));
return scannerId;
}
@@ -2925,7 +2941,7 @@ public class HRegionServer implements C
}
scannerId = addScanner(scanner);
scannerName = String.valueOf(scannerId);
- ttl = leases.leasePeriod;
+ ttl = this.scannerLeaseTimeoutPeriod;
}
if (rows > 0) {
@@ -2999,7 +3015,7 @@ public class HRegionServer implements C
// Adding resets expiration time on lease.
if (scanners.containsKey(scannerName)) {
if (lease != null) leases.addLease(lease);
- ttl = leases.leasePeriod;
+ ttl = this.scannerLeaseTimeoutPeriod;
}
}
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Leases.java Wed Jun 27 04:59:27 2012
@@ -55,7 +55,6 @@ import java.io.IOException;
@InterfaceAudience.Private
public class Leases extends HasThread {
private static final Log LOG = LogFactory.getLog(Leases.class.getName());
- protected final int leasePeriod;
private final int leaseCheckFrequency;
private volatile DelayQueue<Lease> leaseQueue = new DelayQueue<Lease>();
protected final Map<String, Lease> leases = new HashMap<String, Lease>();
@@ -63,13 +62,11 @@ public class Leases extends HasThread {
/**
* Creates a lease monitor
- *
- * @param leasePeriod - length of time (milliseconds) that the lease is valid
+ *
* @param leaseCheckFrequency - how often the lease should be checked
- * (milliseconds)
+ * (milliseconds)
*/
- public Leases(final int leasePeriod, final int leaseCheckFrequency) {
- this.leasePeriod = leasePeriod;
+ public Leases(final int leaseCheckFrequency) {
this.leaseCheckFrequency = leaseCheckFrequency;
setDaemon(true);
}
@@ -135,15 +132,16 @@ public class Leases extends HasThread {
}
/**
- * Obtain a lease
- *
+ * Obtain a lease.
+ *
* @param leaseName name of the lease
+ * @param leaseTimeoutPeriod length of the lease in milliseconds
* @param listener listener that will process lease expirations
* @throws LeaseStillHeldException
*/
- public void createLease(String leaseName, final LeaseListener listener)
- throws LeaseStillHeldException {
- addLease(new Lease(leaseName, listener));
+ public void createLease(String leaseName, int leaseTimeoutPeriod, final LeaseListener listener)
+ throws LeaseStillHeldException {
+ addLease(new Lease(leaseName, leaseTimeoutPeriod, listener));
}
/**
@@ -155,7 +153,7 @@ public class Leases extends HasThread {
if (this.stopRequested) {
return;
}
- lease.setExpirationTime(System.currentTimeMillis() + this.leasePeriod);
+ lease.resetExpirationTime();
synchronized (leaseQueue) {
if (leases.containsKey(lease.getLeaseName())) {
throw new LeaseStillHeldException(lease.getLeaseName());
@@ -202,7 +200,7 @@ public class Leases extends HasThread {
throw new LeaseException("lease '" + leaseName +
"' does not exist or has already expired");
}
- lease.setExpirationTime(System.currentTimeMillis() + leasePeriod);
+ lease.resetExpirationTime();
leaseQueue.add(lease);
}
}
@@ -241,16 +239,14 @@ public class Leases extends HasThread {
static class Lease implements Delayed {
private final String leaseName;
private final LeaseListener listener;
+ private int leaseTimeoutPeriod;
private long expirationTime;
- Lease(final String leaseName, LeaseListener listener) {
- this(leaseName, listener, 0);
- }
-
- Lease(final String leaseName, LeaseListener listener, long expirationTime) {
+ Lease(final String leaseName, int leaseTimeoutPeriod, LeaseListener listener) {
this.leaseName = leaseName;
this.listener = listener;
- this.expirationTime = expirationTime;
+ this.leaseTimeoutPeriod = leaseTimeoutPeriod;
+ this.expirationTime = 0;
}
/** @return the lease name */
@@ -294,9 +290,11 @@ public class Leases extends HasThread {
return this.equals(o) ? 0 : (delta > 0 ? 1 : -1);
}
- /** @param expirationTime the expirationTime to set */
- public void setExpirationTime(long expirationTime) {
- this.expirationTime = expirationTime;
+ /**
+ * Resets the expiration time of the lease.
+ */
+ public void resetExpirationTime() {
+ this.expirationTime = System.currentTimeMillis() + this.leaseTimeoutPeriod;
}
}
-}
\ No newline at end of file
+}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java Wed Jun 27 04:59:27 2012
@@ -25,7 +25,9 @@ import static org.junit.Assert.fail;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.catalog.MetaReader;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.util.Bytes;
@@ -48,7 +50,7 @@ public class TestScannerTimeout {
private final static byte[] SOME_BYTES = Bytes.toBytes("f");
private final static byte[] TABLE_NAME = Bytes.toBytes("t");
private final static int NB_ROWS = 10;
- // Be careful w/ what you set this timer too... it can get in the way of
+ // Be careful w/ what you set this timer to... it can get in the way of
// the mini cluster coming up -- the verification in particular.
private final static int SCANNER_TIMEOUT = 10000;
private final static int SCANNER_CACHING = 5;
@@ -59,7 +61,7 @@ public class TestScannerTimeout {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
Configuration c = TEST_UTIL.getConfiguration();
- c.setInt("hbase.regionserver.lease.period", SCANNER_TIMEOUT);
+ c.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT);
// We need more than one region server for this test
TEST_UTIL.startMiniCluster(2);
HTable table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES);
@@ -134,8 +136,7 @@ public class TestScannerTimeout {
// Since the RS is already created, this conf is client-side only for
// this new table
Configuration conf = new Configuration(TEST_UTIL.getConfiguration());
- conf.setInt(
- HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, SCANNER_TIMEOUT*100);
+ conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT * 100);
HTable higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
ResultScanner r = higherScanTimeoutTable.getScanner(scan);
// This takes way less than SCANNER_TIMEOUT*100
@@ -201,8 +202,7 @@ public class TestScannerTimeout {
// Since the RS is already created, this conf is client-side only for
// this new table
Configuration conf = new Configuration(TEST_UTIL.getConfiguration());
- conf.setInt(
- HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, SCANNER_TIMEOUT*100);
+ conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT * 100);
HTable higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
ResultScanner r = higherScanTimeoutTable.getScanner(scan);
int count = 1;
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java Wed Jun 27 04:59:27 2012
@@ -325,8 +325,9 @@ public class TestCoprocessorInterface ex
// Make lease timeout longer, lease checks less frequent
TEST_UTIL.getConfiguration().setInt(
"hbase.master.lease.thread.wakefrequency", 5 * 1000);
- TEST_UTIL.getConfiguration().setInt(
- "hbase.regionserver.lease.period", 10 * 1000);
+ TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000);
+ TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD,
+ 10 * 1000);
// Increase the amount of time between client retries
TEST_UTIL.getConfiguration().setLong("hbase.client.pause", 15 * 1000);
// This size should make it so we always split using the addContent
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1354325&r1=1354324&r2=1354325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Wed Jun 27 04:59:27 2012
@@ -3797,7 +3797,8 @@ public class TestHRegion extends HBaseTe
// Make lease timeout longer, lease checks less frequent
conf.setInt("hbase.master.lease.thread.wakefrequency", 5 * 1000);
- conf.setInt(HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, 10 * 1000);
+ conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 10 * 1000);
+ conf.setInt(HConstants.HBASE_REGIONSERVER_ROWLOCK_TIMEOUT_PERIOD, 10 * 1000);
// Increase the amount of time between client retries
conf.setLong("hbase.client.pause", 15 * 1000);