Repository: hadoop Updated Branches: refs/heads/YARN-1197 733b0f680 -> 9defd697d
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/9defd697 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9defd697 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9defd697 Branch: refs/heads/YARN-1197 Commit: 9defd697d04fd243d9b8ab6bf4a850ed7af21e00 Parents: 733b0f6 Author: Jian He <[email protected]> Authored: Fri Sep 18 16:42:26 2015 +0800 Committer: Jian He <[email protected]> Committed: Fri Sep 18 16:42:32 2015 +0800 ---------------------------------------------------------------------- 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/9defd697/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5c0f849..cbb886f 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -868,6 +868,8 @@ Release 2.8.0 - UNRELEASED YARN-4078. Add getPendingResourceRequestForAttempt in YarnScheduler interface. (Naganarasimha G R via jianhe) + 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/9defd697/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<Container> getNMReportedIncreasedContainers() { return nmReportedIncreasedContainers == null ? Collections.EMPTY_LIST : nmReportedIncreasedContainers; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9defd697/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; }
