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/03/25 20:53:38 UTC
svn commit: r1085541 - in /hbase/branches/0.90: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/client/HTable.java
src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
Author: stack
Date: Fri Mar 25 19:53:38 2011
New Revision: 1085541
URL: http://svn.apache.org/viewvc?rev=1085541&view=rev
Log:
HBASE-3686 ClientScanner skips too many rows on recovery if using scanner caching
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HTable.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1085541&r1=1085540&r2=1085541&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Mar 25 19:53:38 2011
@@ -60,6 +60,8 @@ Release 0.90.2 - Unreleased
HBASE-3666 TestScannerTimeout fails occasionally
HBASE-3497 TableMapReduceUtil.initTableReducerJob broken due to setConf
method in TableOutputFormat
+ HBASE-3686 ClientScanner skips too many rows on recovery if using scanner
+ caching (Sean Sechrist via Stack)
IMPROVEMENTS
HBASE-3542 MultiGet methods in Thrift
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1085541&r1=1085540&r2=1085541&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HTable.java Fri Mar 25 19:53:38 2011
@@ -1105,15 +1105,18 @@ public class HTable implements HTableInt
boolean skipFirst = false;
do {
try {
+ if (skipFirst) {
+ // Skip only the first row (which was the last row of the last
+ // already-processed batch).
+ callable.setCaching(1);
+ values = getConnection().getRegionServerWithRetries(callable);
+ callable.setCaching(this.caching);
+ skipFirst = false;
+ }
// Server returns a null values if scanning is to stop. Else,
// returns an empty array if scanning is to go on and we've just
// exhausted current region.
values = getConnection().getRegionServerWithRetries(callable);
- if (skipFirst) {
- skipFirst = false;
- // Reget.
- values = getConnection().getRegionServerWithRetries(callable);
- }
} catch (DoNotRetryIOException e) {
if (e instanceof UnknownScannerException) {
long timeout = lastNext + scannerTimeout;
Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java?rev=1085541&r1=1085540&r2=1085541&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java Fri Mar 25 19:53:38 2011
@@ -49,6 +49,7 @@ public class TestScannerTimeout {
// Be careful w/ what you set this timer too... 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;
/**
* @throws java.lang.Exception
@@ -134,4 +135,59 @@ public class TestScannerTimeout {
assertEquals(NB_ROWS, results.length);
r.close();
}
+
+ /**
+ * Test that scanner won't miss any rows if the region server it was reading
+ * from failed. Before 3686, it would skip rows in the scan.
+ * @throws Exception
+ */
+ @Test
+ public void test3686a() throws Exception {
+ HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(TABLE_NAME);
+ Scan scan = new Scan();
+ scan.setCaching(SCANNER_CACHING);
+
+ HTable table = new HTable(TABLE_NAME);
+ ResultScanner r = table.getScanner(scan);
+ int count = 1;
+ r.next();
+ // Kill after one call to next(), which got 5 rows.
+ rs.abort("die!");
+ while(r.next() != null) {
+ count ++;
+ }
+ assertEquals(NB_ROWS, count);
+ r.close();
+ }
+
+ /**
+ * Make sure that no rows are lost if the scanner timeout is longer on the
+ * client than the server, and the scan times out on the server but not the
+ * client.
+ * @throws Exception
+ */
+ @Test
+ public void test3686b() throws Exception {
+ HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(TABLE_NAME);
+ Scan scan = new Scan();
+ scan.setCaching(SCANNER_CACHING);
+ // Set a very high timeout, we want to test what happens when a RS
+ // fails but the region is recovered before the lease times out.
+ // 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);
+ HTable higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
+ ResultScanner r = higherScanTimeoutTable.getScanner(scan);
+ int count = 1;
+ r.next();
+ // Sleep, allowing the scan to timeout on the server but not on the client.
+ Thread.sleep(SCANNER_TIMEOUT+2000);
+ while(r.next() != null) {
+ count ++;
+ }
+ assertEquals(NB_ROWS, count);
+ r.close();
+ }
}
\ No newline at end of file