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 2014/11/26 16:59:33 UTC
hbase git commit: HBASE-12563 After Starting up mini hbase cluster,
Real Configuration of Cluster never set to HBaseTestingUtility (Talat
UYARER)
Repository: hbase
Updated Branches:
refs/heads/master 1350055fc -> 9be143691
HBASE-12563 After Starting up mini hbase cluster, Real Configuration of Cluster never set to HBaseTestingUtility (Talat UYARER)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9be14369
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9be14369
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9be14369
Branch: refs/heads/master
Commit: 9be143691c6b84201fc49b9de040686fab155b48
Parents: 1350055
Author: stack <st...@apache.org>
Authored: Wed Nov 26 07:59:26 2014 -0800
Committer: stack <st...@apache.org>
Committed: Wed Nov 26 07:59:26 2014 -0800
----------------------------------------------------------------------
.../hadoop/hbase/HBaseTestingUtility.java | 6 +++-
.../apache/hadoop/hbase/TestInfoServers.java | 37 +++++++++++++++-----
2 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9be14369/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index c3ebf19..6546ade 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -917,6 +917,10 @@ 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());
@@ -928,7 +932,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
getHBaseAdmin(); // create immediately the hbaseAdmin
LOG.info("Minicluster is up");
- return (MiniHBaseCluster)this.hbaseCluster;
+ return miniHBaseCluster;
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/9be14369/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
index 62b00d8..a76d4d7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
@@ -18,6 +18,7 @@
*/
package org.apache.hadoop.hbase;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.BufferedInputStream;
@@ -46,11 +47,10 @@ 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();
@@ -62,17 +62,36 @@ public class TestInfoServers {
}
/**
+ * 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
*/
@Test
public void testInfoServersRedirect() throws Exception {
// give the cluster time to start up
new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close();
- int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
+ String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
assertContainsContent(new URL("http://localhost:" + port +
"/index.html"), "master-status");
port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
- getInfoServer().getPort();
+ getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
assertContainsContent(new URL("http://localhost:" + port +
"/index.html"), "rs-status");
}
@@ -88,11 +107,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();
- int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
+ String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
assertContainsContent(new URL("http://localhost:" + port +
"/master-status"), "meta");
port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer().
- getInfoServer().getPort();
+ getConfiguration().get(HConstants.REGIONSERVER_INFO_PORT);
assertContainsContent(new URL("http://localhost:" + port +
"/rs-status"), "meta");
}
@@ -103,7 +122,7 @@ public class TestInfoServers {
byte[] cf = Bytes.toBytes("d");
UTIL.createTable(tableName, cf);
new HTable(UTIL.getConfiguration(), tableName).close();
- int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort();
+ String port = UTIL.getConfiguration().get(HConstants.MASTER_INFO_PORT);
assertDoesNotContainContent(
new URL("http://localhost:" + port + "/table.jsp?name=" + tableName + "&action=split&key="),
"Table action request accepted");