diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java index 9a21802..fce0ab7 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java @@ -30,6 +30,7 @@ import java.util.Random; import junit.framework.TestCase; import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.http.HttpConfig; import org.junit.Assert; import org.junit.experimental.categories.Category; @@ -70,9 +71,9 @@ public class TestBytes extends TestCase { public void testSplit2() throws Exception { // More split tests. - byte [] lowest = Bytes.toBytes("http://A"); - byte [] highest = Bytes.toBytes("http://z"); - byte [] middle = Bytes.toBytes("http://]"); + byte [] lowest = Bytes.toBytes(HttpConfig.getSchemePrefix() + "A"); + byte [] highest = Bytes.toBytes(HttpConfig.getSchemePrefix() + "z"); + byte [] middle = Bytes.toBytes(HttpConfig.getSchemePrefix() + "]"); byte [][] parts = Bytes.split(lowest, highest, 1); for (int i = 0; i < parts.length; i++) { System.out.println(Bytes.toString(parts[i])); diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index b064d49..4d81a4c 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -37,6 +37,7 @@ HMaster master; org.apache.hadoop.hbase.client.HConnectionManager; org.apache.hadoop.hbase.HTableDescriptor; org.apache.hadoop.hbase.HBaseConfiguration; + org.apache.hadoop.http.HttpConfig; @@ -283,7 +284,7 @@ if (sl.getTotalCompactingKVs() > 0) { boolean useDefault = (serverLoad == null); int defaultPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030); int infoPort = useDefault?defaultPort:serverLoad.getInfoServerPort(); - String url = "http://" + serverName.getHostname() + ":" + infoPort + "/"; + String url = HttpConfig.getSchemePrefix() + serverName.getHostname() + ":" + infoPort + "/"; <%if (infoPort > 0) %> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 1042734..f1be5bd 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -31,6 +31,7 @@ org.apache.hadoop.hbase.HBaseConfiguration; org.apache.hadoop.hbase.protobuf.ProtobufUtil; org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo; org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad; +org.apache.hadoop.http.HttpConfig; <%if format.equals("json") %> <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &> @@ -148,7 +149,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad; <%else> <%java> String host = regionServer.getMasterAddressManager().getMasterAddress().getHostname() + ":" + masterInfoPort; - String url = "http://" + host + "/"; + String url = HttpConfig.getSchemePrefix() + host + "/"; <% host %> diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java index 3cb6fcd..b4699f2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.http.HttpConfig; /** * A wrapper around HttpClient which provides some useful function and @@ -155,7 +156,7 @@ public class Client { cluster.lastHost = cluster.nodes.get(i); try { StringBuilder sb = new StringBuilder(); - sb.append("http://"); + sb.append(HttpConfig.getSchemePrefix()); sb.append(cluster.lastHost); sb.append(path); URI uri = new URI(sb.toString(), true); diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index 1adbf6e..02dd639 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -23,6 +23,7 @@ import="java.util.List" import="java.util.Map" import="org.apache.hadoop.conf.Configuration" + import="org.apache.hadoop.http.HttpConfig" import="org.apache.hadoop.hbase.client.HTable" import="org.apache.hadoop.hbase.client.HBaseAdmin" import="org.apache.hadoop.hbase.client.HConnectionManager" @@ -199,7 +200,7 @@ HRegionInfo meta = HRegionInfo.FIRST_META_REGIONINFO; ServerName metaLocation = master.getCatalogTracker().waitForMeta(1); for (int i = 0; i < 1; i++) { - String url = "http://" + metaLocation.getHostname() + ":" + infoPort + "/"; + String url = HttpConfig.getSchemePrefix() + metaLocation.getHostname() + ":" + infoPort + "/"; %> <%= escapeXml(meta.getRegionNameAsString()) %> @@ -258,7 +259,7 @@ } // This port might be wrong if RS actually ended up using something else. urlRegionServer = - "http://" + addr.getHostname().toString() + ":" + infoPort + "/"; + HttpConfig.getSchemePrefix() + addr.getHostname().toString() + ":" + infoPort + "/"; Integer i = regDistribution.get(urlRegionServer); if (null == i) i = Integer.valueOf(0); regDistribution.put(urlRegionServer, i+1); 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 4bb53cc..f756807 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 @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.http.HttpConfig; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -67,11 +68,11 @@ public class TestInfoServers { // give the cluster time to start up new HTable(UTIL.getConfiguration(), ".META.").close(); int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort(); - assertContainsContent(new URL("http://localhost:" + port + + assertContainsContent(new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/index.html"), "master-status"); port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer(). getInfoServer().getPort(); - assertContainsContent(new URL("http://localhost:" + port + + assertContainsContent(new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/index.html"), "rs-status"); } @@ -87,11 +88,11 @@ public class TestInfoServers { // give the cluster time to start up new HTable(UTIL.getConfiguration(), ".META.").close(); int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort(); - assertContainsContent(new URL("http://localhost:" + port + + assertContainsContent(new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/master-status"), "META"); port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer(). getInfoServer().getPort(); - assertContainsContent(new URL("http://localhost:" + port + + assertContainsContent(new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/rs-status"), "META"); } @@ -104,10 +105,10 @@ public class TestInfoServers { new HTable(UTIL.getConfiguration(), tableName).close(); int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort(); assertDoesNotContainContent( - new URL("http://localhost:" + port + "/table.jsp?name=" + sTableName + "&action=split&key="), + new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/table.jsp?name=" + sTableName + "&action=split&key="), "Table action request accepted"); assertDoesNotContainContent( - new URL("http://localhost:" + port + "/table.jsp?name=" + sTableName), + new URL(HttpConfig.getSchemePrefix() + "localhost:" + port + "/table.jsp?name=" + sTableName), "Actions:"); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java index a4b0982..91c349d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java @@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.test.MetricsAssertHelper; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.http.HttpConfig; import static org.junit.Assert.*; @@ -565,7 +566,7 @@ public class TestRowResource { @Test public void testURLEncodedKey() throws IOException, JAXBException { - String urlKey = "http://example.com/foo"; + String urlKey = HttpConfig.getSchemePrefix() + "example.com/foo"; StringBuilder path = new StringBuilder(); path.append('/'); path.append(TABLE);