You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/05/07 22:56:33 UTC
hadoop git commit: YARN-3584. Fixed attempt diagnostics format shown
on the UI. Contributed by nijel (cherry picked from commit
b88700dcd0b9aa47662009241dfb83bc4446548d)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 1886bab0f -> c35114a1e
YARN-3584. Fixed attempt diagnostics format shown on the UI. Contributed by nijel
(cherry picked from commit b88700dcd0b9aa47662009241dfb83bc4446548d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c35114a1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c35114a1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c35114a1
Branch: refs/heads/branch-2
Commit: c35114a1e6b8672767feb8eea3a876d2840c6910
Parents: 1886bab
Author: Jian He <ji...@apache.org>
Authored: Thu May 7 13:54:07 2015 -0700
Committer: Jian He <ji...@apache.org>
Committed: Thu May 7 13:56:25 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../resourcemanager/rmapp/attempt/RMAppAttemptImpl.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35114a1/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6bf7292..bc19862 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -285,6 +285,9 @@ Release 2.8.0 - UNRELEASED
YARN-3577. Misspelling of threshold in log4j.properties for tests.
(Brahma Reddy Battula via aajisaka)
+ YARN-3584. Fixed attempt diagnostics format shown on the UI. (nijel via
+ jianhe)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35114a1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.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/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index 8abc65a..684dde8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
@@ -1455,14 +1455,14 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
finishEvent.getApplicationAttemptId()).append(
" exited with ").append(" exitCode: ").append(status.getExitStatus()).
append("\n");
+ diagnosticsBuilder.append("Failing this attempt.").append("Diagnostics: ")
+ .append(status.getDiagnostics());
if (this.getTrackingUrl() != null) {
diagnosticsBuilder.append("For more detailed output,").append(
- " check application tracking page:").append(
+ " check application tracking page: ").append(
this.getTrackingUrl()).append(
- "Then, click on links to logs of each attempt.\n");
+ " Then, click on links to logs of each attempt.\n");
}
- diagnosticsBuilder.append("Diagnostics: ").append(status.getDiagnostics())
- .append("Failing this attempt");
return diagnosticsBuilder.toString();
}