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 pr...@apache.org on 2020/02/11 16:33:07 UTC
[hadoop] branch trunk updated: YARN-10127. Remove setting App
Ordering Policy to ParentQueue in FSQueueConverter
This is an automated email from the ASF dual-hosted git repository.
prabhujoseph 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 e637797 YARN-10127. Remove setting App Ordering Policy to ParentQueue in FSQueueConverter
e637797 is described below
commit e6377972113db844d7e7b99867fad19d3cbc58bd
Author: Prabhu Joseph <pr...@apache.org>
AuthorDate: Tue Feb 11 19:35:31 2020 +0530
YARN-10127. Remove setting App Ordering Policy to ParentQueue in FSQueueConverter
Contributed by Peter Bacsko.
---
.../scheduler/fair/converter/FSQueueConverter.java | 44 +++++++++++-----------
.../fair/converter/TestFSQueueConverter.java | 8 ++--
2 files changed, 27 insertions(+), 25 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/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 44bdad4..f3812bc 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
@@ -294,28 +294,30 @@ public class FSQueueConverter {
* @param queue
*/
private void emitOrderingPolicy(String queueName, FSQueue queue) {
- String policy = queue.getPolicy().getName();
-
- switch (policy) {
- case DominantResourceFairnessPolicy.NAME:
- capacitySchedulerConfig.set(PREFIX + queueName
- + ".ordering-policy", FairSharePolicy.NAME);
- break;
- case FairSharePolicy.NAME:
- capacitySchedulerConfig.set(PREFIX + queueName
- + ".ordering-policy", FairSharePolicy.NAME);
- if (drfUsed) {
- ruleHandler.handleFairAsDrf(queueName);
+ if (queue instanceof FSLeafQueue) {
+ String policy = queue.getPolicy().getName();
+
+ switch (policy) {
+ case DominantResourceFairnessPolicy.NAME:
+ capacitySchedulerConfig.set(PREFIX + queueName
+ + ".ordering-policy", FairSharePolicy.NAME);
+ break;
+ case FairSharePolicy.NAME:
+ capacitySchedulerConfig.set(PREFIX + queueName
+ + ".ordering-policy", FairSharePolicy.NAME);
+ if (drfUsed) {
+ ruleHandler.handleFairAsDrf(queueName);
+ }
+ break;
+ case FifoPolicy.NAME:
+ capacitySchedulerConfig.set(PREFIX + queueName
+ + ".ordering-policy", FifoPolicy.NAME);
+ break;
+ default:
+ String msg = String.format("Unexpected ordering policy " +
+ "on queue %s: %s", queue, policy);
+ conversionOptions.handleConversionError(msg);
}
- break;
- case FifoPolicy.NAME:
- capacitySchedulerConfig.set(PREFIX + queueName
- + ".ordering-policy", FifoPolicy.NAME);
- break;
- default:
- String msg = String.format("Unexpected ordering policy " +
- "on queue %s: %s", queue, policy);
- conversionOptions.handleConversionError(msg);
}
}
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/TestFSQueueConverter.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/TestFSQueueConverter.java
index fe4faab..31e48bf 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/TestFSQueueConverter.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/TestFSQueueConverter.java
@@ -393,13 +393,13 @@ public class TestFSQueueConverter {
converter.convertQueueHierarchy(rootQueue);
// root
- assertEquals("root ordering policy", "fair",
+ assertEquals("root ordering policy", null,
csConfig.get(PREFIX + "root.ordering-policy"));
assertEquals("root.default ordering policy", "fair",
csConfig.get(PREFIX + "root.default.ordering-policy"));
- assertEquals("root.admins ordering policy", "fair",
+ assertEquals("root.admins ordering policy", null,
csConfig.get(PREFIX + "root.admins.ordering-policy"));
- assertEquals("root.users ordering policy", "fair",
+ assertEquals("root.users ordering policy", null,
csConfig.get(PREFIX + "root.users.ordering-policy"));
// root.users
@@ -429,7 +429,7 @@ public class TestFSQueueConverter {
converter.convertQueueHierarchy(rootQueue);
- verify(ruleHandler, times(6)).handleFairAsDrf(anyString());
+ verify(ruleHandler, times(5)).handleFairAsDrf(anyString());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org