hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject svn commit: r1547706 - in /hbase/branches/0.94/src/main: jamon/org/apache/hadoop/hbase/tmpl/master/ jamon/org/apache/hadoop/hbase/tmpl/regionserver/ resources/hbase-webapps/master/
Date Wed, 04 Dec 2013 04:29:41 GMT
Author: larsh
Date: Wed Dec  4 04:29:41 2013
New Revision: 1547706

URL: http://svn.apache.org/r1547706
Log:
HBASE-9986 Incorporate HTTPS support for HBase (0.94 port) (Aditya Kishore)

Modified:
    hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
    hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
    hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
    hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp

Modified: hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon?rev=1547706&r1=1547705&r2=1547706&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
(original)
+++ hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
Wed Dec  4 04:29:41 2013
@@ -50,7 +50,7 @@ ServerName [] serverNames = masters.toAr
 </%java>
 <%if (!master.isActiveMaster()) %>
     <h2>Master</h2>
-    <a href="http://<% serverNames[0].getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port",
60010) %>/master-status" target="_blank"><% serverNames[0].getHostname() %></a>
+    <a href="//<% serverNames[0].getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port",
60010) %>/master-status" target="_blank"><% serverNames[0].getHostname() %></a>
 <%else>
     <h2>Backup Masters</h2>
 
@@ -65,7 +65,7 @@ ServerName [] serverNames = masters.toAr
     for (ServerName serverName: serverNames) {
     </%java>
     <tr>
-        <td><a href="http://<% serverName.getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port",
60010) %>/master-status" target="_blank"><% serverName.getHostname() %></a></td>
+        <td><a href="//<% serverName.getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port",
60010) %>/master-status" target="_blank"><% serverName.getHostname() %></a></td>
         <td><% serverName.getPort() %></td>
         <td><% new Date(serverName.getStartcode()) %></td>
     </tr>

Modified: hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1547706&r1=1547705&r2=1547706&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
(original)
+++ hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Wed Dec  4 04:29:41 2013
@@ -256,7 +256,7 @@ AssignmentManager assignmentManager = ma
        // TODO: this is incorrect since this conf might differ from RS to RS
        // or be set to 0 to get ephemeral ports
        int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030);
-       String url = "http://" + serverName.getHostname() + ":" + infoPort + "/";
+       String url = "//" + serverName.getHostname() + ":" + infoPort + "/";
        HServerLoad hsl = master.getServerManager().getLoad(serverName);
        String loadStr = hsl == null? "-": hsl.toString();
        if (hsl != null) {

Modified: hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1547706&r1=1547705&r2=1547706&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
(original)
+++ hbase/branches/0.94/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
Wed Dec  4 04:29:41 2013
@@ -105,7 +105,7 @@ No hbase.master.info.port found
 <%else>
 <%java>
 String host = regionServer.getMasterAddressManager().getMasterAddress().getHostname() + ":"
+ masterInfoPort;
-String url = "http://" + host + "/";
+String url = "//" + host + "/";
 </%java>
 <a href="<% url %>"><% host %></a>
 </%if>

Modified: hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp?rev=1547706&r1=1547705&r2=1547706&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp Wed Dec  4 04:29:41
2013
@@ -118,7 +118,7 @@
 %>
 <%= tableHeader %>
 <%
-  String url = "http://" + rl.getHostname() + ":" + infoPort + "/";
+  String url = "//" + rl.getHostname() + ":" + infoPort + "/";
 %>
 <tr>
   <td><%= tableName %></td>
@@ -137,7 +137,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 = "//" + metaLocation.getHostname() + ":" + infoPort + "/";
 %>
 <tr>
   <td><%= meta.getRegionNameAsString() %></td>
@@ -183,7 +183,7 @@
     ServerName addr = hriEntry.getValue();
     long req = 0;
 
-    String urlRegionServer = null;
+    String regionServer = null;
 
     if (addr != null) {
       HServerLoad sl = master.getServerManager().getLoad(addr);
@@ -193,21 +193,20 @@
           req = map.get(regionInfo.getRegionName()).getRequestsCount();
         }
         // This port might be wrong if RS actually ended up using something else.
-        urlRegionServer =
-            "http://" + addr.getHostname().toString() + ":" + infoPort + "/";
-        Integer i = regDistribution.get(urlRegionServer);
+        regionServer = addr.getHostname().toString() + ":" + infoPort;
+        Integer i = regDistribution.get(regionServer);
         if (null == i) i = new Integer(0);
-        regDistribution.put(urlRegionServer, i+1);
+        regDistribution.put(regionServer, i+1);
       }
     }
 %>
 <tr>
   <td><%= Bytes.toStringBinary(regionInfo.getRegionName())%></td>
   <%
-  if (urlRegionServer != null) {
+  if (regionServer != null) {
   %>
   <td>
-    <a href="<%= urlRegionServer %>"><%= addr.getHostname().toString() + ":"
+ infoPort %></a>
+    <a href="<%= "//" + regionServer + "/" %>"><%= regionServer %></a>
   </td>
   <%
   } else {
@@ -228,7 +227,7 @@
   for (Map.Entry<String, Integer> rdEntry : regDistribution.entrySet()) {
 %>
 <tr>
-  <td><%= rdEntry.getKey()%></td>
+  <td><a href="<%= "//" + rdEntry.getKey() + "/" %>"><%= rdEntry.getKey()
%></a></td>
   <td><%= rdEntry.getValue()%></td>
 </tr>
 <% } %>



Mime
View raw message