brumi1024 commented on a change in pull request #3550:
URL: https://github.com/apache/hadoop/pull/3550#discussion_r767942678
##########
File path:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
##########
@@ -336,26 +341,24 @@ protected void setupQueueConfigs(Resource clusterResource,
// Collect and set the Node label configuration
this.queueNodeLabelsSettings = new
QueueNodeLabelsSettings(configuration, parent,
- getQueuePath(), csContext);
+ getQueuePath(),
queueContext.getQueueManager().getConfiguredNodeLabelsForAllQueues());
// Initialize the queue capacities
setupConfigurableCapacities(configuration);
updateAbsoluteCapacities();
-
updateCapacityConfigType();
// Fetch minimum/maximum resource limits for this queue if
// configured
- this.resourceTypes = new HashSet<>();
- for (AbsoluteResourceType type : AbsoluteResourceType.values()) {
- resourceTypes.add(type.toString().toLowerCase());
- }
updateConfigurableResourceLimits(clusterResource);
// Setup queue's maximumAllocation respecting the global
// and the queue settings
- this.queueAllocationSettings.setupMaximumAllocation(configuration,
getQueuePath(),
- parent, csContext);
+ // TODO remove the getSchedulerConfiguration() param after the AQC
configuration duplication
Review comment:
Yes, corrected it.
##########
File path:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractLeafQueue.java
##########
@@ -138,40 +147,39 @@
private final List<FiCaSchedulerApp> runnableApps = new ArrayList<>();
private final List<FiCaSchedulerApp> nonRunnableApps = new ArrayList<>();
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public AbstractLeafQueue(CapacitySchedulerContext cs, String queueName,
- CSQueue parent, CSQueue old) {
- this(cs, cs.getConfiguration(), queueName, parent, old, false);
+ public AbstractLeafQueue(CapacitySchedulerQueueContext queueContext,
+ String queueName, CSQueue parent, CSQueue old) throws IOException {
+ this(queueContext, queueName, parent, old, false);
}
- public AbstractLeafQueue(CapacitySchedulerContext cs,
CapacitySchedulerConfiguration configuration,
- String queueName, CSQueue parent, CSQueue old) {
- this(cs, configuration, queueName, parent, old, false);
- }
-
- public AbstractLeafQueue(CapacitySchedulerContext cs,
CapacitySchedulerConfiguration configuration,
- String queueName, CSQueue parent, CSQueue old, boolean isDynamic) {
- super(cs, configuration, queueName, parent, old);
+ public AbstractLeafQueue(CapacitySchedulerQueueContext queueContext,
+ String queueName, CSQueue parent, CSQueue old, boolean isDynamic) throws
+ IOException {
+ super(queueContext, queueName, parent, old);
setDynamicQueue(isDynamic);
- this.usersManager = new UsersManager(usageTracker.getMetrics(), this,
labelManager, csContext,
+ this.usersManager = new UsersManager(usageTracker.getMetrics(), this,
labelManager,
resourceCalculator);
// One time initialization is enough since it is static ordering policy
this.pendingOrderingPolicy = new FifoOrderingPolicyForPendingApps();
}
@SuppressWarnings("checkstyle:nowhitespaceafter")
- protected void setupQueueConfigs(
- Resource clusterResource, CapacitySchedulerConfiguration conf) throws
IOException {
+ protected void setupQueueConfigs(Resource clusterResource,
+ CapacitySchedulerConfiguration conf) throws
+ IOException {
writeLock.lock();
try {
- CapacitySchedulerConfiguration schedConf = csContext.getConfiguration();
+ // TODO conf parameter can be a modified configuration with template
entries and missing
Review comment:
Yes, corrected it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
