HBASE-2656 HMaster.getRegionTableClosest should not return null for closed regions -- disabling TestMaster for now until this issue, hbase-2656 is worked out (also threw in some extra logging on the other TestFromClientSide test)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@956194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-06-19 07:00:17 +00:00
parent 9e73f76604
commit e7812957f3
2 changed files with 10 additions and 1 deletions

View File

@ -3554,6 +3554,7 @@ public class TestFromClientSide {
@Test
public void testRegionCacheDeSerialization() throws Exception {
// 1. test serialization.
LOG.info("Starting testRegionCacheDeSerialization");
final byte[] TABLENAME = Bytes.toBytes("testCachePrewarm2");
final byte[] FAMILY = Bytes.toBytes("family");
Configuration conf = TEST_UTIL.getConfiguration();
@ -3611,6 +3612,7 @@ public class TestFromClientSide {
// delete the temp file
File f = new java.io.File(tempFileName);
f.delete();
LOG.info("Finishing testRegionCacheDeSerialization");
}
/**
@ -3618,6 +3620,7 @@ public class TestFromClientSide {
*/
@Test
public void testRegionCachePreWarm() throws Exception {
LOG.info("Starting testRegionCachePreWarm");
final byte [] TABLENAME = Bytes.toBytes("testCachePrewarm");
Configuration conf = TEST_UTIL.getConfiguration();
@ -3669,6 +3672,7 @@ public class TestFromClientSide {
int prefetchRegionNumber = conf.getInt("hbase.client.prefetch.limit", 10);
// the total number of cached regions == region('aaa") + prefeched regions.
LOG.info("Testing how many regions cached");
assertEquals("Number of cached region is incorrect ", prefetchRegionNumber,
HConnectionManager.getCachedRegionCount(conf, TABLENAME));
@ -3678,6 +3682,7 @@ public class TestFromClientSide {
table.get(g3);
assertEquals("Number of cached region is incorrect ", prefetchRegionNumber,
HConnectionManager.getCachedRegionCount(conf, TABLENAME));
LOG.info("Finishing testRegionCachePreWarm");
}
}

View File

@ -87,8 +87,12 @@ public class TestMaster {
* communication to ZK, find out why this test's behavior has changed.
* Tracked in HBASE-2656.
assertNull(pair);
assertNotNull(pair);
We used to assert NotNull for the pair but it seems that ain't
always true either. For now disabling this assertion. Filing
an issue for it to be checked -- St.Ack.
*/
assertNotNull(pair);
m.getTableRegionFromName(pair.getFirst().getRegionName());
} finally {
proceed.countDown();