MAPREDUCE-4215. RM app page shows 500 error on appid parse error (Jonathon Eagles via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1335647 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
67a514b647
commit
0caac704fb
|
@ -469,6 +469,9 @@ Release 0.23.3 - UNRELEASED
|
||||||
MAPREDUCE-4226. ConcurrentModificationException in FileSystemCounterGroup.
|
MAPREDUCE-4226. ConcurrentModificationException in FileSystemCounterGroup.
|
||||||
(tomwhite)
|
(tomwhite)
|
||||||
|
|
||||||
|
MAPREDUCE-4215. RM app page shows 500 error on appid parse error
|
||||||
|
(Jonathon Eagles via tgraves)
|
||||||
|
|
||||||
Release 0.23.2 - UNRELEASED
|
Release 0.23.2 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -55,7 +55,15 @@ public class AppBlock extends HtmlBlock {
|
||||||
puts("Bad request: requires application ID");
|
puts("Bad request: requires application ID");
|
||||||
return;
|
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);
|
RMContext context = getInstance(RMContext.class);
|
||||||
RMApp rmApp = context.getRMApps().get(appID);
|
RMApp rmApp = context.getRMApps().get(appID);
|
||||||
if (rmApp == null) {
|
if (rmApp == null) {
|
||||||
|
@ -74,7 +82,7 @@ public class AppBlock extends HtmlBlock {
|
||||||
&& !this.aclsManager.checkAccess(callerUGI,
|
&& !this.aclsManager.checkAccess(callerUGI,
|
||||||
ApplicationAccessType.VIEW_APP, app.getUser(), appID)) {
|
ApplicationAccessType.VIEW_APP, app.getUser(), appID)) {
|
||||||
puts("You (User " + remoteUser
|
puts("You (User " + remoteUser
|
||||||
+ ") are not authorized to view the logs for application " + appID);
|
+ ") are not authorized to view application " + appID);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue