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 jh...@apache.org on 2019/09/10 22:40:42 UTC
[hadoop] branch branch-3.1 updated: YARN-9824. Fall back to
configured queue ordering policy class name
This is an automated email from the ASF dual-hosted git repository.
jhung pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new d75693b YARN-9824. Fall back to configured queue ordering policy class name
d75693b is described below
commit d75693bd6ed4a9547f4932d41014a21de1398115
Author: Jonathan Hung <jh...@linkedin.com>
AuthorDate: Tue Sep 10 15:19:07 2019 -0700
YARN-9824. Fall back to configured queue ordering policy class name
(cherry picked from commit f8f8598ea5e86330fa5b553963f5632da286409d)
(cherry picked from commit 1dbf87c9ff33b5e2f6cbb0ce8efd348c4314a0e2)
---
.../capacity/CapacitySchedulerConfiguration.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java
index 38ff188..b279254 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java
@@ -1559,20 +1559,23 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
}
String policyType = get(getQueuePrefix(queue) + ORDERING_POLICY,
- defaultPolicy);
+ defaultPolicy).trim();
QueueOrderingPolicy qop;
- if (policyType.trim().equals(QUEUE_UTILIZATION_ORDERING_POLICY)) {
+ if (policyType.equals(QUEUE_UTILIZATION_ORDERING_POLICY)) {
// Doesn't respect priority
qop = new PriorityUtilizationQueueOrderingPolicy(false);
- } else if (policyType.trim().equals(
+ } else if (policyType.equals(
QUEUE_PRIORITY_UTILIZATION_ORDERING_POLICY)) {
qop = new PriorityUtilizationQueueOrderingPolicy(true);
} else {
- String message =
- "Unable to construct queue ordering policy=" + policyType + " queue="
- + queue;
- throw new YarnRuntimeException(message);
+ try {
+ qop = (QueueOrderingPolicy) Class.forName(policyType).newInstance();
+ } catch (Exception e) {
+ String message = "Unable to construct queue ordering policy="
+ + policyType + " queue=" + queue;
+ throw new YarnRuntimeException(message, e);
+ }
}
return qop;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org