From a37272e0e3b11449e572ee23340e7413345f890d Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Tue, 31 Jul 2012 15:08:47 +0000 Subject: [PATCH] MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367601 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java | 2 +- .../hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6e7dae06194..dd812f94fb3 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -769,6 +769,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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java index 3e2cd12b0dd..96e2f1d4ebc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/AMAttemptInfo.java @@ -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)); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index 672fb28e1f5..25186a61c92 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java @@ -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)); }