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

Revert "HBASE-12563 After Starting up mini hbase cluster, Real Configuration of Cluster never set to HBaseTestingUtility (Talat UYARER)" 

Causes TestZooKeeper to fail.  Reverting.

This reverts commit 9be143691c.
This commit is contained in:
stack 2014-11-26 10:23:49 -08:00
parent 3078316ec5
commit d1f39d8246
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View File

@ -917,10 +917,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
Configuration c = new Configuration(this.conf);
this.hbaseCluster =
new MiniHBaseCluster(c, numMasters, numSlaves, masterClass, regionserverClass);
// Cluster confguration should set HbaseTestingUtility Conf
MiniHBaseCluster miniHBaseCluster = (MiniHBaseCluster) this.hbaseCluster;
this.conf = miniHBaseCluster.getMaster().getConfiguration();
// Don't leave here till we've done a successful scan of the hbase:meta
Table t = new HTable(c, TableName.META_TABLE_NAME);
ResultScanner s = t.getScanner(new Scan());
@ -932,7 +928,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
getHBaseAdmin(); // create immediately the hbaseAdmin
LOG.info("Minicluster is up");
return miniHBaseCluster;
return (MiniHBaseCluster)this.hbaseCluster;
}
/**

37
hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
View File

@ -18,7 +18,6 @@
*/
package org.apache.hadoop.hbase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.BufferedInputStream;
@ -47,10 +46,11 @@ public class TestInfoServers {
@BeforeClass
public static void beforeClass() throws Exception {
// The info servers do not run in tests by default.
// Set them to ephemeral ports so they will start
// The info servers do not run in tests by default.
// Set them to ephemeral ports so they will start
UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 0);
UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);
//We need to make sure that the server can be started as read only.
UTIL.getConfiguration().setBoolean("hbase.master.ui.readonly", true);
UTIL.startMiniCluster();
@ -61,25 +61,6 @@ public class TestInfoServers {
UTIL.shutdownMiniCluster();
}
/**
* Test for checking master info port of cluster whether same with the port of
* TestHBaseTestingUtility's getConfiguration .
*
* @throws Exception
*/
@Test
public void testMasterInfoServerPort() throws Exception {
String confPort = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
String masterPort =
UTIL.getHBaseCluster().getMaster().getConfiguration().get(HConstants.MASTER_INFO_PORT);
String regionPort =
UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().getConfiguration()
.get(HConstants.MASTER_INFO_PORT);
assertEquals(confPort, masterPort);
assertEquals(confPort, regionPort);
}
/**
* @throws Exception
*/
@ -87,11 +68,11 @@ public class TestInfoServers {
public void testInfoServersRedirect() throws Exception {
// give the cluster time to start up
new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close();
String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
assertContainsContent(new URL("http://localhost:" + port +
"/index.html"), "master-status");
port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
getInfoServer().getPort();
assertContainsContent(new URL("http://localhost:" + port +
"/index.html"), "rs-status");
}
@ -107,11 +88,11 @@ public class TestInfoServers {
public void testInfoServersStatusPages() throws Exception {
// give the cluster time to start up
new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close();
String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
assertContainsContent(new URL("http://localhost:" + port +
"/master-status"), "meta");
port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
getInfoServer().getPort();
assertContainsContent(new URL("http://localhost:" + port +
"/rs-status"), "meta");
}
@ -122,7 +103,7 @@ public class TestInfoServers {
byte[] cf = Bytes.toBytes("d");
UTIL.createTable(tableName, cf);
new HTable(UTIL.getConfiguration(), tableName).close();
String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
assertDoesNotContainContent(
new URL("http://localhost:" + port + "/table.jsp?name=" + tableName + "&action=split&key="),
"Table action request accepted");