From 9aefa59ace49e5b79f651e5393a10cea6fac9024 Mon Sep 17 00:00:00 2001 From: Junping Du Date: Wed, 26 Feb 2014 05:25:47 +0000 Subject: [PATCH] Merge r1571924 from trunk: YARN-1561. Fix a generic type warning in FairScheduler. (Chen He via junping_du) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571927 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 80bf182df5d..3f9aac2a0a9 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -15,6 +15,8 @@ Release 2.5.0 - UNRELEASED YARN-1678. Fair scheduler gabs incessantly about reservations (Sandy Ryza) + YARN-1561. Fix a generic type warning in FairScheduler. (Chen He via junping_du) + OPTIMIZATIONS BUG FIXES 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/FairScheduler.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/FairScheduler.java index a27a86d3075..dbadd2d10a1 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/FairScheduler.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/FairScheduler.java @@ -175,7 +175,7 @@ public class FairScheduler extends AbstractYarnScheduler { protected WeightAdjuster weightAdjuster; // Can be null for no weight adjuster protected boolean continuousSchedulingEnabled; // Continuous Scheduling enabled or not protected int continuousSchedulingSleepMs; // Sleep time for each pass in continuous scheduling - private Comparator nodeAvailableResourceComparator = + private Comparator nodeAvailableResourceComparator = new NodeAvailableResourceComparator(); // Node available resource comparator protected double nodeLocalityThreshold; // Cluster threshold for node locality protected double rackLocalityThreshold; // Cluster threshold for rack locality