Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAE981754B for ; Sun, 5 Apr 2015 07:44:00 +0000 (UTC) Received: (qmail 93289 invoked by uid 500); 5 Apr 2015 07:44:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 93222 invoked by uid 500); 5 Apr 2015 07:44:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 93213 invoked by uid 99); 5 Apr 2015 07:44:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Apr 2015 07:44:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50B3DE1057; Sun, 5 Apr 2015 07:44:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xgong@apache.org To: common-commits@hadoop.apache.org Message-Id: <0124aea5565b4fe8bead07c5f98e9968@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3435. AM container to be allocated Appattempt AM container shown as null. Contributed by Bibin A Chundatt Date: Sun, 5 Apr 2015 07:44:00 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 00854d2c2 -> 1eb6d7496 YARN-3435. AM container to be allocated Appattempt AM container shown as null. Contributed by Bibin A Chundatt (cherry picked from commit 96d72118f5c81aa4e0dca0dc0241fbf1a3fff4d2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1eb6d749 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1eb6d749 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1eb6d749 Branch: refs/heads/branch-2 Commit: 1eb6d74967e994033dbb8daa23ddcf0b9db683c8 Parents: 00854d2 Author: Xuan Authored: Sun Apr 5 00:40:57 2015 -0700 Committer: Xuan Committed: Sun Apr 5 00:43:22 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1eb6d749/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 77292f2..cb0ba61 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -94,6 +94,9 @@ Release 2.8.0 - UNRELEASED YARN-3415. Non-AM containers can be counted towards amResourceUsage of a Fair Scheduler queue (Zhihai Xu via Sandy Ryza) + YARN-3435. AM container to be allocated Appattempt AM container shown as null. + (Bibin A Chundatt via xgong) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1eb6d749/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.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/webapp/RMAppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java index 1831920..506e31f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java @@ -209,7 +209,7 @@ public class RMAppAttemptBlock extends AppAttemptBlock{ "AM Container:", appAttempt.getAmContainerId() == null || containers == null || !hasAMContainer(appAttemptReport.getAMContainerId(), containers) - ? null : root_url("container", appAttempt.getAmContainerId()), + ? "N/A" : root_url("container", appAttempt.getAmContainerId()), String.valueOf(appAttempt.getAmContainerId())) ._("Node:", node) ._(