You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2013/07/04 04:44:07 UTC
svn commit: r1499623 - in
/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs:
./ CHANGES.txt src/main/java/
src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
Author: szetszwo
Date: Thu Jul 4 02:44:07 2013
New Revision: 1499623
URL: http://svn.apache.org/r1499623
Log:
svn merge -c 1497143 from branch-2 for HDFS-4932. Avoid a wide line on the name node webUI if we have more Journal nodes.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/ (props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ (props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:r1497143
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1499623&r1=1499622&r2=1499623&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Jul 4 02:44:07 2013
@@ -174,6 +174,9 @@ Release 2.1.0-beta - 2013-07-02
HDFS-4772. Add number of children in HdfsFileStatus. (brandonli)
+ HDFS-4932. Avoid a wide line on the name node webUI if we have more Journal
+ nodes. (Fengdong Yu via cnauroth)
+
OPTIMIZATIONS
BUG FIXES
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1497143
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java?rev=1499623&r1=1499622&r2=1499623&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java Thu Jul 4 02:44:07 2013
@@ -249,9 +249,30 @@ class NamenodeJspHelper {
+ "<thead><tr><td><b>Journal Manager</b></td><td><b>State</b></td></tr></thead>");
for (JournalAndStream jas : log.getJournals()) {
out.print("<tr>");
- out.print("<td>" + jas.getManager());
- if (jas.isRequired()) {
- out.print(" [required]");
+ out.print("<td>");
+
+ /**
+ * Insert a line break every 3 journal nodes to avoid a very wide line.
+ */
+ JournalManager manager = jas.getManager();
+ if (null != manager) {
+ String[] managers = manager.toString().split(",");
+
+ for (int i = 0; i < managers.length; ++i) {
+ out.print(managers[i]);
+
+ if (i < managers.length - 1) {
+ out.print(",");
+ }
+
+ if ((i+1) % 3 == 0) {
+ out.print("<br/>");
+ }
+ }
+
+ if (jas.isRequired()) {
+ out.print(" [required]");
+ }
}
out.print("</td><td>");