Home Explore Help
Register Sign In
apache
/
hadoop
mirror of https://github.com/apache/hadoop.git
2
0
Fork 1
Files Issues 0 Wiki
Browse Source

HDFS-6279. Merge r1589618 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589619 13f79535-47bb-0310-9956-ffa450edef68
Haohui Mai 11 years ago
parent
4ef2598d5d
commit
d49ff92928
3 changed files with 82 additions and 22 deletions
Unified View Show Diff Stats
  1. 2 0
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
  2. 39 13
      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
  3. 41 9
      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File 

@@ -59,6 +59,8 @@ Release 2.5.0 - UNRELEASED
 
 
 
     HDFS-6278. Create HTML5-based UI for SNN. (wheat9)
 
     HDFS-6278. Create HTML5-based UI for SNN. (wheat9)
 
 
 
+    HDFS-6279. Create new index page for JN / DN. (wheat9)
 
+
 
   OPTIMIZATIONS
 
   OPTIMIZATIONS
 
 
 
     HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
 
     HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)

+ 39 - 13
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
View File 

@@ -1,3 +1,5 @@
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <!--
 
 <!--
 
    Licensed to the Apache Software Foundation (ASF) under one or more
 
    Licensed to the Apache Software Foundation (ASF) under one or more
 
    contributor license agreements.  See the NOTICE file distributed with
 
    contributor license agreements.  See the NOTICE file distributed with
 
@@ -14,22 +16,46 @@
 
    See the License for the specific language governing permissions and
 
    See the License for the specific language governing permissions and
 
    limitations under the License.
 
    limitations under the License.
 
 -->
 
 -->
 
-<meta HTTP-EQUIV="REFRESH" content="0;url=dataNodeHome.jsp"/>
 
-<html>
 
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
 
 <head>
 
-<title>Hadoop Administration</title>
 
+<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.0.2/css/bootstrap.min.css" />
 
+<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
 
+<title>DataNode Information</title>
 
 </head>
 
 </head>
 
-
 
 <body>
 
 <body>
 
 
 
-<h1>Hadoop Administration</h1>
 
-
 
-<ul>
 
-
 
-<li><a href="dataNodeHome.jsp">DataNode Home</a></li>
 
-
 
-</ul>
 
-
 
+<header class="navbar navbar-inverse bs-docs-nav" role="banner">
 
+<div class="container">
 
+  <div class="navbar-header">
 
+    <div class="navbar-brand">Hadoop</div>
 
+  </div>
 
+
 
+  <ul class="nav navbar-nav" id="ui-tabs">
 
+    <li><a>Overview</a></li>
 
+  </ul>
 
+</div>
 
+</header>
 
+
 
+<div class="container">
 
+
 
+<div class="tab-content">
 
+  <div class="tab-pane" id="tab-overview">
 
+    <div class="page-header"><h1>DataNode on <small><div id="authority" style="display: inline-block"></div></small></h1></div>
 
+  </div>
 
+</div>
 
+
 
+<div class="row">
 
+  <hr />
 
+  <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
 
+</div>
 
+</div>
 
+
 
+<script type="text/javascript" src="/static/jquery-1.10.2.min.js">
 
+</script><script type="text/javascript" src="/static/bootstrap-3.0.2/js/bootstrap.min.js">
 
+</script>
 
+<script type="text/javascript">
 
+$('#authority').html(window.location.host);
 
+$('#tab-overview').addClass('active');
 
+</script>
 
 </body>
 
 </body>
 
-
 
 </html>
 
 </html>

+ 41 - 9
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
View File 

@@ -1,5 +1,5 @@
 
-<meta HTTP-EQUIV="REFRESH" content="0;url=journalstatus.jsp"/>
 
-<html>
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <!--
 
 <!--
 
    Licensed to the Apache Software Foundation (ASF) under one or more
 
    Licensed to the Apache Software Foundation (ASF) under one or more
 
    contributor license agreements.  See the NOTICE file distributed with
 
    contributor license agreements.  See the NOTICE file distributed with
 
@@ -16,14 +16,46 @@
 
    See the License for the specific language governing permissions and
 
    See the License for the specific language governing permissions and
 
    limitations under the License.
 
    limitations under the License.
 
 -->
 
 -->
 
-<head><title>Hadoop Administration</title></head>
 
-
 
+<html xmlns="http://www.w3.org/1999/xhtml">
 
+<head>
 
+<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.0.2/css/bootstrap.min.css" />
 
+<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
 
+<title>JournalNode Information</title>
 
+</head>
 
 <body>
 
 <body>
 
-<h1>Hadoop Administration</h1>
 
 
 
-<ul> 
-  <li><a href="journalstatus.jsp">Status</a></li> 
-</ul>
 
+<header class="navbar navbar-inverse bs-docs-nav" role="banner">
 
+<div class="container">
 
+  <div class="navbar-header">
 
+    <div class="navbar-brand">Hadoop</div>
 
+  </div>
 
+
 
+  <ul class="nav navbar-nav" id="ui-tabs">
 
+    <li><a>Overview</a></li>
 
+  </ul>
 
+</div>
 
+</header>
 
+
 
+<div class="container">
 
+
 
+<div class="tab-content">
 
+  <div class="tab-pane" id="tab-overview">
 
+    <div class="page-header"><h1>JournalNode on <small><div id="authority" style="display: inline-block"></div></small></h1></div>
 
+  </div>
 
+</div>
 
+
 
+<div class="row">
 
+  <hr />
 
+  <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
 
+</div>
 
+</div>
 
 
 
-</body> 
+<script type="text/javascript" src="/static/jquery-1.10.2.min.js">
 
+</script><script type="text/javascript" src="/static/bootstrap-3.0.2/js/bootstrap.min.js">
 
+</script>
 
+<script type="text/javascript">
 
+$('#authority').html(window.location.host);
 
+$('#tab-overview').addClass('active');
 
+</script>
 
+</body>
 
 </html>
 
 </html>