YARN-7670. [Addendum patch] Including some unstaged changes.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8e0d86ae Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8e0d86ae Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8e0d86ae Branch: refs/heads/YARN-6592 Commit: 8e0d86aed213327977a47b58e834bc2fc92354a2 Parents: b3d72cd Author: Arun Suresh <asur...@apache.org> Authored: Wed Dec 20 15:57:10 2017 -0800 Committer: Arun Suresh <asur...@apache.org> Committed: Tue Jan 9 11:54:47 2018 -0800 ---------------------------------------------------------------------- .../scheduler/capacity/CapacityScheduler.java | 2 +- .../scheduler/common/fica/FiCaSchedulerApp.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e0d86ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index 84273de..d92ce58 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -2672,7 +2672,7 @@ public class CapacityScheduler extends // proposal might be outdated if AM failover just finished // and proposal queue was not be consumed in time if (app != null && attemptId.equals(app.getApplicationAttemptId())) { - if (app.accept(cluster, request)) { + if (app.accept(cluster, request, updatePending)) { app.apply(cluster, request, updatePending); LOG.info("Allocation proposal accepted"); isSuccess = true; http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e0d86ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.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/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java index 62f48a5..4ea0347 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java @@ -375,7 +375,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt { } public boolean accept(Resource cluster, - ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode> request) { + ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode> request, + boolean checkPending) { ContainerRequest containerRequest = null; boolean reReservation = false; @@ -408,9 +409,11 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt { schedulerContainer.getRmContainer().getContainerRequest(); // Check pending resource request - if (!appSchedulingInfo.checkAllocation(allocation.getAllocationLocalityType(), - schedulerContainer.getSchedulerNode(), - schedulerContainer.getSchedulerRequestKey())) { + if (checkPending && + !appSchedulingInfo.checkAllocation( + allocation.getAllocationLocalityType(), + schedulerContainer.getSchedulerNode(), + schedulerContainer.getSchedulerRequestKey())) { if (LOG.isDebugEnabled()) { LOG.debug("No pending resource for: nodeType=" + allocation .getAllocationLocalityType() + ", node=" + schedulerContainer --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
