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

merge -r 1335646:1335647 from trunk. FIXES: MAPREDUCE-4215 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-05-08 17:14:43 +00:00
parent c35e442b1b
commit 9b6535579e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4226. ConcurrentModificationException in FileSystemCounterGroup.
(tomwhite)
MAPREDUCE-4215. RM app page shows 500 error on appid parse error
(Jonathon Eagles via tgraves)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java
View File

@ -55,7 +55,15 @@ public class AppBlock extends HtmlBlock {
puts("Bad request: requires application ID");
return;
}
ApplicationId appID = Apps.toAppID(aid);
ApplicationId appID = null;
try {
appID = Apps.toAppID(aid);
} catch (Exception e) {
puts("Invalid Application ID: " + aid);
return;
}
RMContext context = getInstance(RMContext.class);
RMApp rmApp = context.getRMApps().get(appID);
if (rmApp == null) {
@ -74,7 +82,7 @@ public class AppBlock extends HtmlBlock {
&& !this.aclsManager.checkAccess(callerUGI,
ApplicationAccessType.VIEW_APP, app.getUser(), appID)) {
puts("You (User " + remoteUser
+ ") are not authorized to view the logs for application " + appID);
+ ") are not authorized to view application " + appID);
return;
}