You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2017/07/12 04:53:54 UTC
[38/50] [abbrv] hadoop git commit: YARN-6764. Simplify the logic in
FairScheduler#attemptScheduling. Contributed by Yufei Gu.
YARN-6764. Simplify the logic in FairScheduler#attemptScheduling. Contributed by Yufei Gu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3de47ab5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3de47ab5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3de47ab5
Branch: refs/heads/YARN-5972
Commit: 3de47ab5ea5cb75805a03010dc72e11b0cf6c173
Parents: ba5b056
Author: Yufei Gu <yu...@apache.org>
Authored: Sun Jul 9 16:08:37 2017 -0700
Committer: Yufei Gu <yu...@apache.org>
Committed: Sun Jul 9 16:09:12 2017 -0700
----------------------------------------------------------------------
.../resourcemanager/scheduler/fair/FairScheduler.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3de47ab5/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
----------------------------------------------------------------------
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 d779159..b41d3f7 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
@@ -1046,16 +1046,13 @@ public class FairScheduler extends
Resource maxResourcesToAssign = Resources.multiply(
node.getUnallocatedResource(), 0.5f);
while (node.getReservedContainer() == null) {
- boolean assignedContainer = false;
Resource assignment = queueMgr.getRootQueue().assignContainer(node);
- if (!assignment.equals(Resources.none())) {
- assignedContainers++;
- assignedContainer = true;
- Resources.addTo(assignedResource, assignment);
- }
- if (!assignedContainer) {
+ if (assignment.equals(Resources.none())) {
break;
}
+
+ assignedContainers++;
+ Resources.addTo(assignedResource, assignment);
if (!shouldContinueAssigning(assignedContainers, maxResourcesToAssign,
assignedResource)) {
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org