Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2732 TestZooKeeper was broken, HBASE-2691 showed it 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@955070 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2010-06-15 22:13:25 +00:00
parent 16dfe22a6d
commit 71f2632f64
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -385,6 +385,7 @@ Release 0.21.0 - Unreleased
(Kannan Muthukkaruppan via Todd Lipcon)
HBASE-2712 Cached region location that went stale won't recover if
asking for first row
HBASE-2732 TestZooKeeper was broken, HBASE-2691 showed it
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

17
src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
View File

@ -51,7 +51,7 @@ public class TestZooKeeper {
private final static HBaseTestingUtility
TEST_UTIL = new HBaseTestingUtility();
private Configuration conf;
private static Configuration conf;
/**
* @throws java.lang.Exception
@ -61,7 +61,8 @@ public class TestZooKeeper {
// Test we can first start the ZK cluster by itself
TEST_UTIL.startMiniZKCluster();
TEST_UTIL.getConfiguration().setBoolean("dfs.support.append", true);
TEST_UTIL.startMiniCluster(1);
TEST_UTIL.startMiniCluster(2);
conf = TEST_UTIL.getConfiguration();
}
/**
@ -77,15 +78,9 @@ public class TestZooKeeper {
*/
@Before
public void setUp() throws Exception {
conf = TEST_UTIL.getConfiguration();
TEST_UTIL.ensureSomeRegionServersAvailable(2);
}
/**
* @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {}
/**
* See HBASE-1232 and http://wiki.apache.org/hadoop/ZooKeeper/FAQ#4.
* @throws IOException
@ -118,14 +113,12 @@ public class TestZooKeeper {
public void testRegionServerSessionExpired() throws Exception{
LOG.info("Starting testRegionServerSessionExpired");
new HTable(conf, HConstants.META_TABLE_NAME);
TEST_UTIL.getMiniHBaseCluster().getRegionServer(0).getConfiguration().
setBoolean("hbase.regionserver.restart.on.zk.expire", true);
TEST_UTIL.expireRegionServerSession(0);
testSanity();
}
@Test
public void testMasterSessionExpired() throws Exception {
LOG.info("Starting testRegionServerSessionExpired");
LOG.info("Starting testMasterSessionExpired");
new HTable(conf, HConstants.META_TABLE_NAME);
TEST_UTIL.expireMasterSession();
testSanity();