You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tg...@apache.org on 2012/05/08 19:15:34 UTC
svn commit: r1335649 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java
Author: tgraves
Date: Tue May 8 17:15:33 2012
New Revision: 1335649
URL: http://svn.apache.org/viewvc?rev=1335649&view=rev
Log:
merge -r 1335647:1335648 from branch-2. FIXES: MAPREDUCE-4215
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1335649&r1=1335648&r2=1335649&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue May 8 17:15:33 2012
@@ -183,6 +183,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
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java?rev=1335649&r1=1335648&r2=1335649&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppBlock.java Tue May 8 17:15:33 2012
@@ -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;
}