szilard-nemeth commented on a change in pull request #3551: URL: https://github.com/apache/hadoop/pull/3551#discussion_r731034595
########## 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/QueueNodeLabelsSettings.java ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity; + +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.util.Sets; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.ROOT; +import java.io.IOException; +import java.util.Set; + +public class QueueNodeLabelsSettings { + private final CSQueue parent; + private final String queuePath; + private final CapacitySchedulerContext csContext; + private Set<String> accessibleLabels; + private Set<String> configuredNodeLabels; + private String defaultLabelExpression; + + public QueueNodeLabelsSettings(CapacitySchedulerConfiguration configuration, + CSQueue parent, + String queuePath, + CapacitySchedulerContext csContext) throws IOException { + this.parent = parent; + this.queuePath = queuePath; + this.csContext = csContext; + initializeNodeLabels(configuration); + } + + private void initializeNodeLabels(CapacitySchedulerConfiguration configuration) + throws IOException { + initializeAccessibleLabels(configuration); + initializeDefaultLabelExpression(configuration); + initializeConfiguredNodeLabels(); + validateNodeLabels(); + } + + private void initializeAccessibleLabels(CapacitySchedulerConfiguration configuration) { + this.accessibleLabels = configuration.getAccessibleNodeLabels(queuePath); + // Inherit labels from parent if not set + if (this.accessibleLabels == null && parent != null) { + this.accessibleLabels = parent.getAccessibleNodeLabels(); + } + } + + private void initializeDefaultLabelExpression(CapacitySchedulerConfiguration configuration) { + this.defaultLabelExpression = configuration.getDefaultNodeLabelExpression(queuePath); + // If the accessible labels is not null and the queue has a parent with a + // similar set of labels copy the defaultNodeLabelExpression from the parent + if (this.accessibleLabels != null && parent != null + && this.defaultLabelExpression == null && + this.accessibleLabels.containsAll(parent.getAccessibleNodeLabels())) { + this.defaultLabelExpression = parent.getDefaultNodeLabelExpression(); + } + } + + private void initializeConfiguredNodeLabels() { + if (csContext.getCapacitySchedulerQueueManager() != null + && csContext.getCapacitySchedulerQueueManager().getConfiguredNodeLabels() != null) { + if (queuePath.equals(ROOT)) { + this.configuredNodeLabels = csContext.getCapacitySchedulerQueueManager() + .getConfiguredNodeLabels().getAllConfiguredLabels(); + } else { + this.configuredNodeLabels = csContext.getCapacitySchedulerQueueManager() + .getConfiguredNodeLabels().getLabelsByQueue(queuePath); + } + } else { + // Fallback to suboptimal but correct logic + this.configuredNodeLabels = csContext.getConfiguration().getConfiguredNodeLabels(queuePath); + } + } + + private void validateNodeLabels() throws IOException { + // Check if labels of this queue is a subset of parent queue, only do this + // when the queue in question is not root + if (isNotRoot()) { + if (parent.getAccessibleNodeLabels() != null && !parent + .getAccessibleNodeLabels().contains(RMNodeLabelsManager.ANY)) { + // If parent isn't "*", child shouldn't be "*" too + if (this.getAccessibleNodeLabels().contains(RMNodeLabelsManager.ANY)) { + throw new IOException("Parent's accessible queue is not ANY(*), " + + "but child's accessible queue is " + RMNodeLabelsManager.ANY); + } else { + Set<String> diff = Sets.difference(this.getAccessibleNodeLabels(), + parent.getAccessibleNodeLabels()); + if (!diff.isEmpty()) { + throw new IOException(String.format( + "Some labels of child queue is not a subset of parent queue, these labels=[%s]", + StringUtils.join(diff, ","))); + } + } + } + } + } + + private boolean isNotRoot() { + return parent != null && parent.getParent() != null; Review comment: I would refrain to integrate it to this PR, let me explain why: I generally don't prefer to review moving of a specific code block + added code refactoring to the code that was moved as it's more difficult to understand what has happened. Are you fine with a follow-up jira to change over to the QueuePath? ########## 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/QueueNodeLabelsSettings.java ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity; + +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.util.Sets; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.ROOT; +import java.io.IOException; +import java.util.Set; + +public class QueueNodeLabelsSettings { + private final CSQueue parent; + private final String queuePath; + private final CapacitySchedulerContext csContext; + private Set<String> accessibleLabels; + private Set<String> configuredNodeLabels; + private String defaultLabelExpression; + + public QueueNodeLabelsSettings(CapacitySchedulerConfiguration configuration, + CSQueue parent, + String queuePath, Review comment: See my comment above :) ########## 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/QueueNodeLabelsSettings.java ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity; + +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.util.Sets; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.ROOT; +import java.io.IOException; +import java.util.Set; + +public class QueueNodeLabelsSettings { + private final CSQueue parent; + private final String queuePath; + private final CapacitySchedulerContext csContext; + private Set<String> accessibleLabels; + private Set<String> configuredNodeLabels; + private String defaultLabelExpression; + + public QueueNodeLabelsSettings(CapacitySchedulerConfiguration configuration, + CSQueue parent, + String queuePath, + CapacitySchedulerContext csContext) throws IOException { + this.parent = parent; + this.queuePath = queuePath; + this.csContext = csContext; + initializeNodeLabels(configuration); + } + + private void initializeNodeLabels(CapacitySchedulerConfiguration configuration) + throws IOException { + initializeAccessibleLabels(configuration); + initializeDefaultLabelExpression(configuration); + initializeConfiguredNodeLabels(); + validateNodeLabels(); + } + + private void initializeAccessibleLabels(CapacitySchedulerConfiguration configuration) { + this.accessibleLabels = configuration.getAccessibleNodeLabels(queuePath); + // Inherit labels from parent if not set + if (this.accessibleLabels == null && parent != null) { + this.accessibleLabels = parent.getAccessibleNodeLabels(); + } + } + + private void initializeDefaultLabelExpression(CapacitySchedulerConfiguration configuration) { + this.defaultLabelExpression = configuration.getDefaultNodeLabelExpression(queuePath); + // If the accessible labels is not null and the queue has a parent with a + // similar set of labels copy the defaultNodeLabelExpression from the parent + if (this.accessibleLabels != null && parent != null + && this.defaultLabelExpression == null && + this.accessibleLabels.containsAll(parent.getAccessibleNodeLabels())) { + this.defaultLabelExpression = parent.getDefaultNodeLabelExpression(); + } + } + + private void initializeConfiguredNodeLabels() { + if (csContext.getCapacitySchedulerQueueManager() != null + && csContext.getCapacitySchedulerQueueManager().getConfiguredNodeLabels() != null) { + if (queuePath.equals(ROOT)) { Review comment: See my comment above :) -- 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]
