YARN-7513. Remove the scheduler lock in FSAppAttempt.getWeight() (Contributed by Wilfred Spiegelenburg)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/03c311ea Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/03c311ea Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/03c311ea Branch: refs/heads/YARN-5881 Commit: 03c311eae3ad591630a452921172a4406dbda181 Parents: 67bbbe1 Author: yufei <yu...@apache.org> Authored: Tue Nov 21 10:33:34 2017 -0800 Committer: yufei <yu...@apache.org> Committed: Tue Nov 21 10:33:34 2017 -0800 ---------------------------------------------------------------------- .../resourcemanager/scheduler/fair/FSAppAttempt.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/03c311ea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.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/FSAppAttempt.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/FSAppAttempt.java index 94991eb..e711229 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/FSAppAttempt.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/FSAppAttempt.java @@ -1304,20 +1304,14 @@ public class FSAppAttempt extends SchedulerApplicationAttempt @Override public float getWeight() { - double weight = 1.0; + float weight = 1.0F; if (scheduler.isSizeBasedWeight()) { - scheduler.getSchedulerReadLock().lock(); - - try { - // Set weight based on current memory demand - weight = Math.log1p(getDemand().getMemorySize()) / Math.log(2); - } finally { - scheduler.getSchedulerReadLock().unlock(); - } + // Set weight based on current memory demand + weight = (float)(Math.log1p(demand.getMemorySize()) / Math.log(2)); } - return (float)weight * this.getPriority().getPriority(); + return weight * appPriority.getPriority(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
