Repository: hadoop Updated Branches: refs/heads/branch-2 7411c74b1 -> 1081b4c4a
HADOOP-9907. Webapp http://hostname:port/metrics link is not working. (aajisaka) (cherry picked from commit 342efa110af9989829b8a8caa699658a2ba01607) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1081b4c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1081b4c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1081b4c4 Branch: refs/heads/branch-2 Commit: 1081b4c4a73c88d057a5a2781d8e7e9a710ff32e Parents: 7411c74 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Jan 30 02:49:10 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Jan 30 02:50:46 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java | 2 +- .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java | 2 +- .../main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java | 2 +- .../apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java | 2 +- .../hadoop/yarn/server/resourcemanager/webapp/NavBlock.java | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 518274f..f28243b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -432,6 +432,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11316. "mvn package -Pdist,docs -DskipTests -Dtar" fails because of non-ascii characters. (ozawa) + HADOOP-9907. Webapp http://hostname:port/metrics link is not working. + (aajisaka) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java index 0edeb16..4eed7e3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java @@ -83,6 +83,6 @@ public class NavBlock extends HtmlBlock { li().a("/conf", "Configuration")._(). li().a("/logs", "Local logs")._(). li().a("/stacks", "Server stacks")._(). - li().a("/metrics", "Server metrics")._()._()._(); + li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java index 231e362..7e49d52 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java @@ -70,6 +70,6 @@ public class HsNavBlock extends HtmlBlock { li().a("/conf", "Configuration")._(). li().a("/logs", "Local logs")._(). li().a("/stacks", "Server stacks")._(). - li().a("/metrics", "Server metrics")._()._()._(); + li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java index febc818..cdc13eb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java @@ -36,6 +36,6 @@ public class NavBlock extends HtmlBlock { li().a("/conf", "Configuration")._(). li().a("/stacks", "Thread dump")._(). li().a("/logs", "Logs")._(). - li().a("/metrics", "Metrics")._()._()._(); + li().a("/jmx?qry=Hadoop:*", "Metrics")._()._()._(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java index c198ae6..1c3b63b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java @@ -59,7 +59,7 @@ public class NavBlock extends HtmlBlock implements YarnWebParams { .li().a("/conf", "Configuration")._() .li().a("/logs", "Local logs")._() .li().a("/stacks", "Server stacks")._() - .li().a("/metrics", "Server metrics")._()._()._(); + .li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/1081b4c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java index db00bb0..48df391 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java @@ -51,6 +51,6 @@ public class NavBlock extends HtmlBlock { li().a("/conf", "Configuration")._(). li().a("/logs", "Local logs")._(). li().a("/stacks", "Server stacks")._(). - li().a("/metrics", "Server metrics")._()._()._(); + li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._(); } }
