Repository: hadoop Updated Branches: refs/heads/branch-2.9 f1ac158c4 -> 90074c136
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/90074c13 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90074c13 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90074c13 Branch: refs/heads/branch-2.9 Commit: 90074c1369ebdd72e71f5b320af060d3f042f07d Parents: f1ac158 Author: Weiwei Yang <[email protected]> Authored: Tue Nov 6 13:14:57 2018 +0800 Committer: Weiwei Yang <[email protected]> Committed: Tue Nov 6 13:47:40 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/90074c13/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 4f51e4e..0530d99 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 @@ -228,7 +228,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/90074c13/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 18b4ba5..f0567a5 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 @@ -195,7 +195,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: [email protected] For additional commands, e-mail: [email protected]
