Repository: hadoop Updated Branches: refs/heads/branch-3.2 378f189c4 -> b474239e0
YARN-8969. AbstractYarnScheduler#getNodeTracker should return generic type to avoid type casting. Contributed by Wanqiang Ji. (cherry picked from commit c7fcca0d7ec9e31d43ef3040ecd576ec808f1f8b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b474239e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b474239e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b474239e Branch: refs/heads/branch-3.2 Commit: b474239e0b7ef58be574e6e8be5dfd1ff6f0a09b Parents: 378f189 Author: Weiwei Yang <w...@apache.org> Authored: Tue Nov 6 13:14:57 2018 +0800 Committer: Weiwei Yang <w...@apache.org> Committed: Tue Nov 6 13:17:19 2018 +0800 ---------------------------------------------------------------------- .../server/resourcemanager/scheduler/AbstractYarnScheduler.java | 2 +- .../server/resourcemanager/scheduler/fair/FSPreemptionThread.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b474239e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index 0acfca7..7acedf2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -237,7 +237,7 @@ public abstract class AbstractYarnScheduler } @VisibleForTesting - public ClusterNodeTracker getNodeTracker() { + public ClusterNodeTracker<N> getNodeTracker() { return nodeTracker; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b474239e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.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/fair/FSPreemptionThread.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java index c32565f..6ed90f8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java @@ -229,7 +229,7 @@ class FSPreemptionThread extends Thread { private void trackPreemptionsAgainstNode(List<RMContainer> containers, FSAppAttempt app) { - FSSchedulerNode node = (FSSchedulerNode) scheduler.getNodeTracker() + FSSchedulerNode node = scheduler.getNodeTracker() .getNode(containers.get(0).getNodeId()); node.addContainersForPreemption(containers, app); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
