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 7f50272..0c51478 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 @@ -964,8 +964,8 @@ public Allocation allocate(ApplicationAttemptId applicationAttemptId, application.updateBlacklist(blacklistAdditions, blacklistRemovals); - allocation = application.getAllocation(getResourceCalculator(), - getClusterResource(), getMinimumResourceCapability()); + allocation = application.getAllocation(getClusterResource(), + getMinimumResourceCapability()); } finally { application.getWriteLock().unlock(); } 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 a12c5ec..2f701cf 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 @@ -678,13 +678,12 @@ public void markContainerForPreemption(ContainerId cont) { * of the resources that will be allocated to and preempted from this * application. * - * @param resourceCalculator resourceCalculator * @param clusterResource clusterResource * @param minimumAllocation minimumAllocation * @return an allocation */ - public Allocation getAllocation(ResourceCalculator resourceCalculator, - Resource clusterResource, Resource minimumAllocation) { + public Allocation getAllocation(Resource clusterResource, + Resource minimumAllocation) { try { writeLock.lock(); Set currentContPreemption = Collections.unmodifiableSet(