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

svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-07-31 15:09:49 +00:00
parent a1a7ee23f7
commit 6fe821a14a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,6 +645,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4456. LocalDistributedCacheManager can get an
ArrayIndexOutOfBounds when creating symlinks (Robert Evans via tgraves)
MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java
View File

@ -64,7 +64,7 @@ public class AMAttemptInfo {
if (containerId != null) {
this.containerId = containerId.toString();
this.logsLink = join("http://" + nodeHttpAddress,
ujoin("node", "containerlogs", this.containerId));
ujoin("node", "containerlogs", this.containerId, user));
}
}

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java
View File

@ -972,7 +972,8 @@ public class TestAMWebServicesJobs extends JerseyTest {
WebServicesTestUtils.checkStringMatch("containerId", amInfo
.getContainerId().toString(), containerId);
String localLogsLink = ujoin("node", "containerlogs", containerId);
String localLogsLink =ujoin("node", "containerlogs", containerId,
job.getUserName());
assertTrue("logsLink", logsLink.contains(localLogsLink));
}