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 E236D17AED for ; Wed, 23 Sep 2015 20:32:59 +0000 (UTC) Received: (qmail 72591 invoked by uid 500); 23 Sep 2015 20:32:55 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 72113 invoked by uid 500); 23 Sep 2015 20:32:55 -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 70688 invoked by uid 99); 23 Sep 2015 20:32:54 -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; Wed, 23 Sep 2015 20:32:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F4FEE0A96; Wed, 23 Sep 2015 20:32:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Wed, 23 Sep 2015 20:33:13 -0000 Message-Id: In-Reply-To: <0566134e15834fbf968df1619e8ad8cc@git.apache.org> References: <0566134e15834fbf968df1619e8ad8cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/21] hadoop git commit: YARN-4171. Fix findbugs warnings in YARN-1197 branch. Contributed by Wangda Tan YARN-4171. Fix findbugs warnings in YARN-1197 branch. Contributed by Wangda Tan Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b3f6b641 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b3f6b641 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b3f6b641 Branch: refs/heads/YARN-1197 Commit: b3f6b641dccb0d59df78855e2951d2cae7dff8ad Parents: 89cab1b Author: Jian He Authored: Fri Sep 18 16:42:26 2015 +0800 Committer: Wangda Tan Committed: Wed Sep 23 13:29:38 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java | 1 + .../resourcemanager/scheduler/SchedulerApplicationAttempt.java | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3f6b641/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c27c897..d1e6bc7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -900,6 +900,8 @@ Release 2.8.0 - UNRELEASED YARN-4188. Make MoveApplicationAcrossQueues abstract, newInstance static. (Giovanni Matteo Fumarola via cdouglas) + YARN-4171. Fix findbugs warnings in YARN-1197 branch. (Wangda Tan via jianhe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3f6b641/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.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/rmnode/RMNodeStatusEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java index 8323f3c..0dbea1a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java @@ -93,6 +93,7 @@ public class RMNodeStatusEvent extends RMNodeEvent { this.logAggregationReportsForApps = logAggregationReportsForApps; } + @SuppressWarnings("unchecked") public List getNMReportedIncreasedContainers() { return nmReportedIncreasedContainers == null ? Collections.EMPTY_LIST : nmReportedIncreasedContainers; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3f6b641/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.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/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java index f064e97..005fa71 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java @@ -478,9 +478,6 @@ public class SchedulerApplicationAttempt implements SchedulableEntity { ContainerType containerType = ContainerType.TASK; // The working knowledge is that masterContainer for AM is null as it // itself is the master container. - RMAppAttempt appAttempt = rmContext.getRMApps() - .get(container.getId().getApplicationAttemptId().getApplicationId()) - .getCurrentAppAttempt(); if (isWaitingForAMContainer(getApplicationId())) { containerType = ContainerType.APPLICATION_MASTER; }