This is an automated email from the ASF dual-hosted git repository.
snemeth 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 d58c10c YARN-11071. AutoCreatedQueueTemplate incorrect wildcard
level. Contributed by Tamas Domok
d58c10c is described below
commit d58c10c3a5f0d6c923d8a49457ce5a73a0ec7011
Author: Szilard Nemeth <[email protected]>
AuthorDate: Thu Feb 17 19:03:44 2022 +0100
YARN-11071. AutoCreatedQueueTemplate incorrect wildcard level. Contributed
by Tamas Domok
---
.../scheduler/capacity/AutoCreatedQueueTemplate.java | 3 +--
.../scheduler/capacity/TestAutoCreatedQueueTemplate.java | 11 +++++++++++
2 files changed, 12 insertions(+), 2 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/AutoCreatedQueueTemplate.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/AutoCreatedQueueTemplate.java
index 1603b19..8fa1e13 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/AutoCreatedQueueTemplate.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/AutoCreatedQueueTemplate.java
@@ -170,8 +170,7 @@ public class AutoCreatedQueueTemplate {
int wildcardLevel = 0;
// root can not be wildcarded
// MAX_WILDCARD_LEVEL will be configurable in the future
- int supportedWildcardLevel = Math.min(queuePathMaxIndex - 1,
- MAX_WILDCARD_LEVEL);
+ int supportedWildcardLevel = Math.min(queuePathMaxIndex,
MAX_WILDCARD_LEVEL);
// Allow root to have template properties
if (queuePath.isRoot()) {
supportedWildcardLevel = 0;
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/TestAutoCreatedQueueTemplate.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/TestAutoCreatedQueueTemplate.java
index 5b58feb..e73001b 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/TestAutoCreatedQueueTemplate.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/TestAutoCreatedQueueTemplate.java
@@ -89,6 +89,17 @@ public class TestAutoCreatedQueueTemplate {
}
@Test
+ public void testWildcardAfterRoot() {
+ conf.set(getTemplateKey("root.*", "acl_submit_applications"), "user");
+ AutoCreatedQueueTemplate template =
+ new AutoCreatedQueueTemplate(conf, new QueuePath("root.a"));
+ template.setTemplateEntriesForChild(conf, "root.a");
+
+ Assert.assertEquals("acl_submit_applications is set", "user",
+ template.getTemplateProperties().get("acl_submit_applications"));
+ }
+
+ @Test
public void testTemplatePrecedence() {
conf.set(getTemplateKey("root.a.b", "capacity"), "6w");
conf.set(getTemplateKey("root.a.*", "capacity"), "4w");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
