YARN-4028. AppBlock page key update and diagnostics value null on recovery. Contributed by Bibin A Chundatt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22dc5fc2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22dc5fc2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22dc5fc2 Branch: refs/heads/YARN-1197 Commit: 22dc5fc20942a8d98333ed5470b5fb8c1d257f1a Parents: 7ecbfd4 Author: Xuan <xg...@apache.org> Authored: Tue Aug 18 22:53:03 2015 -0700 Committer: Xuan <xg...@apache.org> Committed: Tue Aug 18 22:53:03 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/server/webapp/AppBlock.java | 6 +++--- .../hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/22dc5fc2/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 707300a..b22777c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/22dc5fc2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java index 98a8f81..31a2c8a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java @@ -195,13 +195,13 @@ public class AppBlock extends HtmlBlock { && 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()); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/22dc5fc2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index 42ff1de..2eb74f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -782,7 +782,8 @@ public class RMAppImpl implements RMApp, Recoverable { 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();
