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

YARN-4028. AppBlock page key update and diagnostics value null on

Browse Source 
recovery. Contributed by Bibin A Chundatt
This commit is contained in:
Xuan 2015-08-18 22:53:03 -07:00
parent 7ecbfd44aa
commit 22dc5fc209
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -780,6 +780,9 @@ Release 2.8.0 - UNRELEASED
YARN-3987. Send AM container completed msg to NM once AM finishes.
(sandflee via jianhe)
YARN-4028. AppBlock page key update and diagnostics value null on recovery
(Bibin A Chundatt via xgong)
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES

6
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

@ -195,13 +195,13 @@ public ApplicationReport run() throws Exception {
&& webUiType.equals(YarnWebParams.RM_WEB_UI)) {
LogAggregationStatus status = getLogAggregationStatus();
if (status == null) {
overviewTable._("Log Aggregation Status", "N/A");
overviewTable._("Log Aggregation Status:", "N/A");
} else if (status == LogAggregationStatus.DISABLED
|| status == LogAggregationStatus.NOT_START
|| status == LogAggregationStatus.SUCCEEDED) {
overviewTable._("Log Aggregation Status", status.name());
overviewTable._("Log Aggregation Status:", status.name());
} else {
overviewTable._("Log Aggregation Status",
overviewTable._("Log Aggregation Status:",
root_url("logaggregationstatus", app.getAppId()), status.name());
}
}

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
View File

@ -782,7 +782,8 @@ public void recover(RMState state) {
LOG.info("Recovering app: " + getApplicationId() + " with " +
+ appState.getAttemptCount() + " attempts and final state = "
+ this.recoveredFinalState );
this.diagnostics.append(appState.getDiagnostics());
this.diagnostics.append(null == appState.getDiagnostics() ? "" : appState
.getDiagnostics());
this.storedFinishTime = appState.getFinishTime();
this.startTime = appState.getStartTime();