big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-8022. ResourceManager UI cluster/app/<app-id> page fails to render. Contributed by Tarun Parimi.

Browse Source
This commit is contained in:
Rohith Sharma K S 2018-03-14 09:42:20 +05:30
parent 76be6cbf6c
commit e6de10d0a6
1 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
View File

@ -109,8 +109,7 @@ protected void render(Block html) {
final GetApplicationReportRequest request = final GetApplicationReportRequest request =
GetApplicationReportRequest.newInstance(appID); GetApplicationReportRequest.newInstance(appID);
if (callerUGI == null) { if (callerUGI == null) {
appReport = appReport = getApplicationReport(request);
appBaseProt.getApplicationReport(request).getApplicationReport();
} else { } else {
appReport = callerUGI.doAs( appReport = callerUGI.doAs(
new PrivilegedExceptionAction<ApplicationReport> () { new PrivilegedExceptionAction<ApplicationReport> () {
@ -143,14 +142,19 @@ public ApplicationReport run() throws Exception {
try { try {
final GetApplicationAttemptsRequest request = final GetApplicationAttemptsRequest request =
GetApplicationAttemptsRequest.newInstance(appID); GetApplicationAttemptsRequest.newInstance(appID);
if (callerUGI == null) {
attempts = getApplicationAttemptsReport(request);
} else {
attempts = callerUGI.doAs( attempts = callerUGI.doAs(
new PrivilegedExceptionAction<Collection< new PrivilegedExceptionAction<Collection<
ApplicationAttemptReport>>() { ApplicationAttemptReport>>() {
@Override @Override
public Collection<ApplicationAttemptReport> run() throws Exception { public Collection<ApplicationAttemptReport> run()
throws Exception {
return getApplicationAttemptsReport(request); return getApplicationAttemptsReport(request);
} }
}); });
}
} catch (Exception e) { } catch (Exception e) {
String message = String message =
"Failed to read the attempts of the application " + appID + "."; "Failed to read the attempts of the application " + appID + ".";
@ -204,6 +208,25 @@ public Collection<ApplicationAttemptReport> run() throws Exception {
String schedulerPath = WebAppUtils.getResolvedRMWebAppURLWithScheme(conf) + String schedulerPath = WebAppUtils.getResolvedRMWebAppURLWithScheme(conf) +
"/cluster/scheduler?openQueues=" + app.getQueue(); "/cluster/scheduler?openQueues=" + app.getQueue();
generateOverviewTable(app, schedulerPath, webUiType, appReport);
createApplicationMetricsTable(html);
html.__(InfoBlock.class);
generateApplicationTable(html, callerUGI, attempts);
}
/**
* Generate overview table for app web page.
* @param app app info.
* @param schedulerPath schedule path.
* @param webUiType web ui type.
* @param appReport app report.
*/
private void generateOverviewTable(AppInfo app, String schedulerPath,
String webUiType, ApplicationReport appReport) {
ResponseInfo overviewTable = info("Application Overview") ResponseInfo overviewTable = info("Application Overview")
.__("User:", schedulerPath, app.getUser()) .__("User:", schedulerPath, app.getUser())
.__("Name:", app.getName()) .__("Name:", app.getName())
@ -265,37 +288,6 @@ public Collection<ApplicationAttemptReport> run() throws Exception {
overviewTable.__("AM container Node Label expression:", overviewTable.__("AM container Node Label expression:",
app.getAmNodeLabelExpression() == null ? "<Not set>" app.getAmNodeLabelExpression() == null ? "<Not set>"
: app.getAmNodeLabelExpression()); : app.getAmNodeLabelExpression());
try {
final GetApplicationAttemptsRequest request =
GetApplicationAttemptsRequest.newInstance(appID);
if (callerUGI == null) {
attempts = appBaseProt.getApplicationAttempts(request)
.getApplicationAttemptList();
} else {
attempts = callerUGI.doAs(
new PrivilegedExceptionAction<Collection<ApplicationAttemptReport>> () {
@Override
public Collection<ApplicationAttemptReport> run() throws Exception {
return appBaseProt.getApplicationAttempts(request)
.getApplicationAttemptList();
}
});
}
} catch (Exception e) {
String message =
"Failed to read the attempts of the application " + appID + ".";
LOG.error(message, e);
html.p().__(message).__();
return;
}
createApplicationMetricsTable(html);
html.__(InfoBlock.class);
generateApplicationTable(html, callerUGI, attempts);
} }
protected void generateApplicationTable(Block html, protected void generateApplicationTable(Block html,