This is an automated email from the ASF dual-hosted git repository.
bteke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 030811bf85e YARN-11543: Fix checkstyle issues after YARN-11520. (#5896)
030811bf85e is described below
commit 030811bf85e8cb06f753c53099e229285add4b9c
Author: Benjamin Teke <brumi1...@users.noreply.github.com>
AuthorDate: Mon Jul 31 15:44:18 2023 +0200
YARN-11543: Fix checkstyle issues after YARN-11520. (#5896)
Co-authored-by: Benjamin Teke <bt...@cloudera.com>
---
.../scheduler/capacity/AbstractCSQueue.java | 29 +++++++++++-----------
...lerNewQueueAutoCreationWithCapacityVectors.java | 28 +++++++++++++--------
2 files changed, 33 insertions(+), 24 deletions(-)
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/AbstractCSQueue.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/AbstractCSQueue.java
index 26e14afc0fd..a84a68ac409 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/AbstractCSQueue.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/AbstractCSQueue.java
@@ -439,21 +439,22 @@ public abstract class AbstractCSQueue implements CSQueue {
*/
protected void parseAndSetDynamicTemplates() {
// Set the template properties from the parent to the queuepath of the
child
- ((AbstractParentQueue) parent).getAutoCreatedQueueTemplate()
- .setTemplateEntriesForChild(queueContext.getConfiguration(),
getQueuePath(), this instanceof AbstractLeafQueue);
-
- String parentTemplate = String.format("%s.%s", parent.getQueuePath(),
- AutoCreatedQueueTemplate.AUTO_QUEUE_TEMPLATE_PREFIX);
- parentTemplate = parentTemplate.substring(0, parentTemplate.lastIndexOf(
- DOT));
- Set<String> parentNodeLabels = queueContext.getQueueManager()
- .getConfiguredNodeLabelsForAllQueues()
- .getLabelsByQueue(parentTemplate);
-
- if (parentNodeLabels != null && parentNodeLabels.size() > 1) {
- queueContext.getQueueManager().getConfiguredNodeLabelsForAllQueues()
+ ((AbstractParentQueue) parent).getAutoCreatedQueueTemplate()
+ .setTemplateEntriesForChild(queueContext.getConfiguration(),
getQueuePath(),
+ this instanceof AbstractLeafQueue);
+
+ String parentTemplate = String.format("%s.%s", parent.getQueuePath(),
+ AutoCreatedQueueTemplate.AUTO_QUEUE_TEMPLATE_PREFIX);
+ parentTemplate = parentTemplate.substring(0, parentTemplate.lastIndexOf(
+ DOT));
+ Set<String> parentNodeLabels = queueContext.getQueueManager()
+ .getConfiguredNodeLabelsForAllQueues()
+ .getLabelsByQueue(parentTemplate);
+
+ if (parentNodeLabels != null && parentNodeLabels.size() > 1) {
+ queueContext.getQueueManager().getConfiguredNodeLabelsForAllQueues()
.setLabelsByQueue(getQueuePath(), new
HashSet<>(parentNodeLabels));
- }
+ }
}
protected void setDynamicQueueACLProperties() {
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors.java
index f09471ebad3..ccbea250f5f 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors.java
@@ -35,7 +35,7 @@ import java.io.IOException;
import static
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueueUtils.EPSILON;
public class TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
- extends TestCapacitySchedulerAutoCreatedQueueBase {
+ extends TestCapacitySchedulerAutoCreatedQueueBase {
public static final int GB = 1024;
private static final String NL = CommonNodeLabelsManager.NO_LABEL;
private MockRM mockRM = null;
@@ -112,8 +112,10 @@ public class
TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
csConf.setAutoQueueCreationV2Enabled(A, true);
// Set up dynamic queue templates
- csConf.set(getTemplateKey(CapacitySchedulerConfiguration.ROOT,
"capacity"), "[memory=2000mb, vcores=2]");
- csConf.set(getLeafTemplateKey(A, "capacity"), "[memory=2000, vcores=4]");
+ csConf.set(getTemplateKey(CapacitySchedulerConfiguration.ROOT, "capacity"),
+ "[memory=2000mb, vcores=2]");
+ csConf.set(getLeafTemplateKey(A, "capacity"),
+ "[memory=2000, vcores=4]");
}
private void createMixedConfig() {
@@ -140,9 +142,12 @@ public class
TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
csConf.setAutoQueueCreationV2Enabled(D, true);
// Set up dynamic queue templates
- csConf.set(getTemplateKey(CapacitySchedulerConfiguration.ROOT,
"capacity"), "[memory=2w, vcores=5w]");
- csConf.set(getParentTemplateKey(CapacitySchedulerConfiguration.ROOT,
"capacity"), "[memory=2w, vcores=10]");
- csConf.set(getLeafTemplateKey(CapacitySchedulerConfiguration.ROOT + ".*",
"capacity"), "[memory=2000, vcores=2]");
+ csConf.set(getTemplateKey(CapacitySchedulerConfiguration.ROOT, "capacity"),
+ "[memory=2w, vcores=5w]");
+ csConf.set(getParentTemplateKey(CapacitySchedulerConfiguration.ROOT,
"capacity"),
+ "[memory=2w, vcores=10]");
+ csConf.set(getLeafTemplateKey(CapacitySchedulerConfiguration.ROOT + ".*",
"capacity"),
+ "[memory=2000, vcores=2]");
csConf.set(getLeafTemplateKey(D, "capacity"), "[memory=1000, vcores=1]");
}
@@ -214,7 +219,8 @@ public class
TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
}
/*
- Create and validate the following structure with mixed resource vectors and
non-legacy queue mode:
+ Create and validate the following structure with mixed resource vectors
+ and non-legacy queue mode:
root
┌─────┬────────┬─────┴─────┬─────────┐
@@ -232,8 +238,9 @@ public class
TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
// Check if queue c-auto got created
CSQueue cAuto = cs.getQueue("root.c-auto");
// At this point queues a, b, d exists, ant c-auto was just created
- // b takes 2000 MB from the cluster, a and d take up 10 + 10 = 20% (6000
MB, 6 vcore), so c-auto should get the rest
- // (24000 MB, 24 vcore) because it's the only one with configured weights
+ // b takes 2000 MB from the cluster, a and d take up 10 + 10 = 20% (6000
MB, 6 vcore),
+ // so c-auto should get the rest (24000 MB, 24 vcore) because it's the
only one
+ // with configured weights
Assert.assertEquals(24 / 32f, cAuto.getAbsoluteCapacity(), EPSILON);
Assert.assertEquals(-1f, cAuto.getQueueCapacities().getWeight(), EPSILON);
Assert.assertEquals(24000,
@@ -267,7 +274,8 @@ public class
TestCapacitySchedulerNewQueueAutoCreationWithCapacityVectors
Assert.assertEquals(2,
a2Auto.getQueueResourceQuotas().getEffectiveMinResource().getVirtualCores());
- // Absolute requests take precedence over percentage and weight, hence a1
should have 1000 MB, 0 vcore
+ // Absolute requests take precedence over percentage and weight,
+ // hence a1 should have 1000 MB, 0 vcore
CSQueue a1 = cs.getQueue("root.a.a1");
Assert.assertEquals(1000,
a1.getQueueResourceQuotas().getEffectiveMinResource().getMemorySize());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
