From 1514466b7a8a0bee953c3fe904fc2ea020e60463 Mon Sep 17 00:00:00 2001 From: Siddharth Seth Date: Fri, 16 Mar 2012 18:48:57 +0000 Subject: [PATCH] merge MAPREDUCE-4005 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301693 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java | 3 ++- .../server/resourcemanager/webapp/TestRMWebServicesApps.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f8a19aeaf2d..9ce263de3cb 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -237,6 +237,9 @@ Release 0.23.2 - UNRELEASED MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. (Robert Joseph Evans via vinodkv) + MAPREDUCE-4005. Fixes broken AM container logs URL on ResourceManager + Application Info page. (Jason Lowe via sseth) + Release 0.23.1 - 2012-02-17 NEW FEATURES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java index f7f54aae3f1..47a263ded8d 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java @@ -118,7 +118,8 @@ public AppInfo(RMApp app, Boolean hasAccess) { this.amContainerLogsExist = true; String url = join("http://", masterContainer.getNodeHttpAddress(), "/node", "/containerlogs/", - ConverterUtils.toString(masterContainer.getId())); + ConverterUtils.toString(masterContainer.getId()), + "/", app.getUser()); this.amContainerLogs = url; this.amHostHttpAddress = masterContainer.getNodeHttpAddress(); } diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 61012aa483f..2fbf3fdd864 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -751,6 +751,8 @@ public void verifyAppInfoGeneric(RMApp app, String id, String user, amHostHttpAddress); assertTrue("amContainerLogs doesn't match", amContainerLogs.startsWith("http://")); + assertTrue("amContainerLogs doesn't contain user info", + amContainerLogs.endsWith("/" + app.getUser())); } }