Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Siddharth Seth 2012-03-16 18:48:57 +00:00
parent debf136f0d
commit 1514466b7a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -237,6 +237,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job'
whose tasks don't write any outputs. (Robert Joseph Evans via vinodkv) 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 Release 0.23.1 - 2012-02-17
NEW FEATURES NEW FEATURES

3
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
View File

@ -118,7 +118,8 @@ public class AppInfo {
this.amContainerLogsExist = true; this.amContainerLogsExist = true;
String url = join("http://", masterContainer.getNodeHttpAddress(), String url = join("http://", masterContainer.getNodeHttpAddress(),
"/node", "/containerlogs/", "/node", "/containerlogs/",
ConverterUtils.toString(masterContainer.getId())); ConverterUtils.toString(masterContainer.getId()),
"/", app.getUser());
this.amContainerLogs = url; this.amContainerLogs = url;
this.amHostHttpAddress = masterContainer.getNodeHttpAddress(); this.amHostHttpAddress = masterContainer.getNodeHttpAddress();
} }

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
View File

@ -751,6 +751,8 @@ public class TestRMWebServicesApps extends JerseyTest {
amHostHttpAddress); amHostHttpAddress);
assertTrue("amContainerLogs doesn't match", assertTrue("amContainerLogs doesn't match",
amContainerLogs.startsWith("http://")); amContainerLogs.startsWith("http://"));
assertTrue("amContainerLogs doesn't contain user info",
amContainerLogs.endsWith("/" + app.getUser()));
} }
} }