Repository: hadoop Updated Branches: refs/heads/branch-2 c314a6635 -> 1d40bc225
YARN-7057. FSAppAttempt#getResourceUsage doesn't need to consider resources queued for preemption. (Contributed by Karthik via Yufei Gu) (cherry picked from commit 82c5dd1d508292ed88eda0f5356776437ba67d4c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d40bc22 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d40bc22 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d40bc22 Branch: refs/heads/branch-2 Commit: 1d40bc225a18bbfe9e5dce1c2f99ce4213b31cbc Parents: c314a66 Author: Yufei Gu <[email protected]> Authored: Tue Sep 12 14:58:23 2017 -0700 Committer: Yufei Gu <[email protected]> Committed: Tue Sep 12 16:14:31 2017 -0700 ---------------------------------------------------------------------- .../scheduler/fair/FSAppAttempt.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d40bc22/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 f202559..06ba4e3 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 @@ -614,9 +614,16 @@ public class FSAppAttempt extends SchedulerApplicationAttempt // Check if the app's allocation will be over its fairshare even // after preempting this container - Resource usageAfterPreemption = Resources.subtract( - getResourceUsage(), container.getAllocatedResource()); + Resource usageAfterPreemption = Resources.clone(getResourceUsage()); + // Subtract resources of containers already queued for preemption + synchronized (preemptionVariablesLock) { + Resources.subtractFrom(usageAfterPreemption, resourcesToBePreempted); + } + + // Subtract this container's allocation to compute usage after preemption + Resources.subtractFrom( + usageAfterPreemption, container.getAllocatedResource()); return !isUsageBelowShare(usageAfterPreemption, getFairShare()); } @@ -1268,13 +1275,7 @@ public class FSAppAttempt extends SchedulerApplicationAttempt @Override public Resource getResourceUsage() { - // Subtract copies the object, so that we have a snapshot, - // in case usage changes, while the caller is using the value - synchronized (preemptionVariablesLock) { - return containersToBePreempted.isEmpty() - ? getCurrentConsumption() - : Resources.subtract(getCurrentConsumption(), resourcesToBePreempted); - } + return getCurrentConsumption(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
