Browse Source

MAPREDUCE-3324. Not All HttpServer tools links (stacks,logs,config,metrics) are accessible through all UI servers (Jonathan Eagles via mahadev) - Merging r1201914 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201916 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 13 years ago
parent
commit
686975c9fb

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -66,6 +66,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3379. Fixed LocalResourceTracker in NodeManager to remove deleted
     cache entries correctly. (Siddharth Seth via vinodkv)
 
+    MAPREDUCE-3324. Not All HttpServer tools links (stacks,logs,config,metrics) are 
+    accessible through all UI servers (Jonathan Eagles via mahadev)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

+ 1 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java

@@ -68,6 +68,7 @@ public class HsNavBlock extends HtmlBlock {
       h3("Tools").
         ul().
           li().a("/conf", "Configuration")._().
+          li().a("/logs", "Local logs")._().
           li().a("/stacks", "Server stacks")._().
           li().a("/metrics", "Server metrics")._()._()._().
     div("#themeswitcher")._();

+ 6 - 2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java

@@ -37,8 +37,12 @@ public class NavBlock extends HtmlBlock implements YarnWebParams {
           .li()
             .a(url("allContainers"), "List of Containers")._()
         ._()
-        .h3()._("Tools")._()
-      ._()
+        .h3("Tools")
+        .ul()
+          .li().a("/conf", "Configuration")._()
+          .li().a("/logs", "Local logs")._()
+          .li().a("/stacks", "Server stacks")._()
+          .li().a("/metrics", "Server metrics")._()._()._()
       .div("#themeswitcher")._();
   }