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

HBASE-3853 Fix TestInfoServers to pass after HBASE-3835

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1099542 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-05-04 17:54:50 +00:00
parent 81e9be2518
commit 4e4ded4cde
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -98,6 +98,7 @@ Release 0.91.0 - Unreleased
HBASE-3847 Turn off DEBUG logging of RPCs in WriteableRPCEngine on TRUNK HBASE-3847 Turn off DEBUG logging of RPCs in WriteableRPCEngine on TRUNK
HBASE-3777 Redefine Identity Of HBase Configuration (Karthick Sankarachary) HBASE-3777 Redefine Identity Of HBase Configuration (Karthick Sankarachary)
HBASE-3849 Fix master ui; hbase-1502 broke requests/second HBASE-3849 Fix master ui; hbase-1502 broke requests/second
HBASE-3853 Fix TestInfoServers to pass after HBASE-3835 (todd)
IMPROVEMENTS IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)

33
src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
View File

@ -45,16 +45,35 @@ public class TestInfoServers extends HBaseClusterTestCase {
/** /**
* @throws Exception * @throws Exception
*/ */
public void testInfoServersAreUp() throws Exception { public void testInfoServersRedirect() throws Exception {
// give the cluster time to start up // give the cluster time to start up
new HTable(conf, ".META."); new HTable(conf, ".META.");
int port = cluster.getMaster().getInfoServer().getPort(); int port = cluster.getMaster().getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:" + port + assertHasExpectedContent(new URL("http://localhost:" + port +
"/index.html"), "master"); "/index.html"), "master-status");
port = cluster.getRegionServerThreads().get(0).getRegionServer(). port = cluster.getRegionServerThreads().get(0).getRegionServer().
getInfoServer().getPort(); getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:" + port + assertHasExpectedContent(new URL("http://localhost:" + port +
"/index.html"), "regionserver"); "/index.html"), "rs-status");
}
/**
* Test that the status pages in the minicluster load properly.
*
* This is somewhat a duplicate of TestRSStatusServlet and
* TestMasterStatusServlet, but those are true unit tests
* whereas this uses a cluster.
*/
public void testInfoServersStatusPages() throws Exception {
// give the cluster time to start up
new HTable(conf, ".META.");
int port = cluster.getMaster().getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:" + port +
"/master-status"), "META");
port = cluster.getRegionServerThreads().get(0).getRegionServer().
getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:" + port +
"/rs-status"), "META");
} }
private void assertHasExpectedContent(final URL u, final String expected) private void assertHasExpectedContent(final URL u, final String expected)
@ -62,8 +81,7 @@ public class TestInfoServers extends HBaseClusterTestCase {
LOG.info("Testing " + u.toString() + " has " + expected); LOG.info("Testing " + u.toString() + " has " + expected);
java.net.URLConnection c = u.openConnection(); java.net.URLConnection c = u.openConnection();
c.connect(); c.connect();
assertTrue(c.getContentLength() > 0); StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder(c.getContentLength());
BufferedInputStream bis = new BufferedInputStream(c.getInputStream()); BufferedInputStream bis = new BufferedInputStream(c.getInputStream());
byte [] bytes = new byte[1024]; byte [] bytes = new byte[1024];
for (int read = -1; (read = bis.read(bytes)) != -1;) { for (int read = -1; (read = bis.read(bytes)) != -1;) {
@ -71,6 +89,9 @@ public class TestInfoServers extends HBaseClusterTestCase {
} }
bis.close(); bis.close();
String content = sb.toString(); String content = sb.toString();
assertTrue(content.contains(expected)); if (!content.contains(expected)) {
fail("Didn't have expected string '" + expected + "'. Content:\n"
+ content);
}
} }
} }