You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bt...@apache.org on 2023/01/02 14:35:37 UTC
[hadoop] branch trunk updated: YARN-11393. Fs2cs could be extended to set ULF to -1 upon conversion (#5201)
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 c44c9f984be YARN-11393. Fs2cs could be extended to set ULF to -1 upon conversion (#5201)
c44c9f984be is described below
commit c44c9f984beed5ec2fed8d36a959bb2140739366
Author: susheel-gupta <11...@users.noreply.github.com>
AuthorDate: Mon Jan 2 20:05:16 2023 +0530
YARN-11393. Fs2cs could be extended to set ULF to -1 upon conversion (#5201)
---
.../scheduler/fair/converter/FSQueueConverter.java | 13 +++++++++++++
.../converter/TestFSConfigToCSConfigConverter.java | 22 +++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
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/fair/converter/FSQueueConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverter.java
index 0e9b3894885..c29d020b10c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverter.java
@@ -17,12 +17,15 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter;
import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.USER_LIMIT_FACTOR;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.ConfigurableResource;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
@@ -79,6 +82,7 @@ public class FSQueueConverter {
emitMaxParallelApps(queueName, queue);
emitMaxAllocations(queueName, queue);
emitPreemptionDisabled(queueName, queue);
+ emitDefaultUserLimitFactor(queueName, children);
emitChildCapacity(queue);
emitMaximumCapacity(queueName, queue);
@@ -215,6 +219,15 @@ public class FSQueueConverter {
}
}
+ public void emitDefaultUserLimitFactor(String queueName, List<FSQueue> children) {
+ if (children.isEmpty()) {
+ capacitySchedulerConfig.setFloat(
+ CapacitySchedulerConfiguration.
+ PREFIX + queueName + DOT + USER_LIMIT_FACTOR,
+ -1.0f);
+ }
+ }
+
/**
* yarn.scheduler.fair.sizebasedweight ==>
* yarn.scheduler.capacity.<queue-path>
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/fair/converter/TestFSConfigToCSConfigConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java
index c1c774bed09..86bf113d64e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java
@@ -17,6 +17,7 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter;
import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.USER_LIMIT_FACTOR;
import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.DYNAMIC_MAX_ASSIGN;
import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.MAX_CAPACITY_PERCENTAGE;
import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.MAX_CHILD_CAPACITY;
@@ -182,7 +183,26 @@ public class TestFSConfigToCSConfigConverter {
conf.get(PREFIX + "root.admins.alice.maximum-am-resource-percent"));
assertNull("root.users.joe maximum-am-resource-percent should be null",
- conf.get(PREFIX + "root.users.joe maximum-am-resource-percent"));
+ conf.get(PREFIX + "root.users.joe.maximum-am-resource-percent"));
+ }
+
+ @Test
+ public void testDefaultUserLimitFactor() throws Exception {
+ converter.convert(config);
+
+ Configuration conf = converter.getCapacitySchedulerConfig();
+
+ assertNull("root.users user-limit-factor should be null",
+ conf.get(PREFIX + "root.users." + USER_LIMIT_FACTOR));
+
+ assertEquals("root.default user-limit-factor", "-1.0",
+ conf.get(PREFIX + "root.default.user-limit-factor"));
+
+ assertEquals("root.users.joe user-limit-factor", "-1.0",
+ conf.get(PREFIX + "root.users.joe.user-limit-factor"));
+
+ assertEquals("root.admins.bob user-limit-factor", "-1.0",
+ conf.get(PREFIX + "root.admins.bob.user-limit-factor"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org