HBASE-6827. [WINDOWS] TestScannerTimeout fails expecting a timeout

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1407290 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2012-11-08 22:13:19 +00:00
parent 227dfa8bd4
commit b28150763d
1 changed files with 5 additions and 3 deletions

View File

@ -51,6 +51,7 @@ public class TestScannerTimeout {
private final static int NB_ROWS = 10; private final static int NB_ROWS = 10;
// Be careful w/ what you set this timer to... 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. // the mini cluster coming up -- the verification in particular.
private final static int THREAD_WAKE_FREQUENCY = 1000;
private final static int SCANNER_TIMEOUT = 10000; private final static int SCANNER_TIMEOUT = 10000;
private final static int SCANNER_CACHING = 5; private final static int SCANNER_CACHING = 5;
@ -61,6 +62,7 @@ public class TestScannerTimeout {
public static void setUpBeforeClass() throws Exception { public static void setUpBeforeClass() throws Exception {
Configuration c = TEST_UTIL.getConfiguration(); Configuration c = TEST_UTIL.getConfiguration();
c.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT); c.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT);
c.setInt(HConstants.THREAD_WAKE_FREQUENCY, THREAD_WAKE_FREQUENCY);
// We need more than one region server for this test // We need more than one region server for this test
TEST_UTIL.startMiniCluster(2); TEST_UTIL.startMiniCluster(2);
HTable table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES); HTable table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES);
@ -106,7 +108,7 @@ public class TestScannerTimeout {
count++; count++;
if (count == 5) { if (count == 5) {
// Sleep just a bit more to be sure // Sleep just a bit more to be sure
Thread.sleep(SCANNER_TIMEOUT+100); Thread.sleep(SCANNER_TIMEOUT + THREAD_WAKE_FREQUENCY + 100);
} }
res = r.next(); res = r.next();
} }
@ -147,7 +149,7 @@ public class TestScannerTimeout {
LOG.info("END ************ test2772"); LOG.info("END ************ test2772");
} }
/** /**
* Test that scanner won't miss any rows if the region server it was reading * 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. * from failed. Before 3686, it would skip rows in the scan.
@ -183,7 +185,7 @@ public class TestScannerTimeout {
table.close(); table.close();
LOG.info("************ END TEST3686A"); LOG.info("************ END TEST3686A");
} }
/** /**
* Make sure that no rows are lost if the scanner timeout is longer on the * 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 than the server, and the scan times out on the server but not the