This is an automated email from the ASF dual-hosted git repository.
slfan1989 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 dffb5057259f YARN-11650. Refactoring variable names related
multiNodePolicy in MultiNodePolicySpec, FiCaSchedulerApp and AbstractCSQueue
(#6490) Contributed by Jiandan Yang.
dffb5057259f is described below
commit dffb5057259f7e7a64aaa9b0e11bc1836f8f63ac
Author: Yang Jiandan <succeedin2...@gmail.com>
AuthorDate: Mon Jan 29 21:37:32 2024 +0800
YARN-11650. Refactoring variable names related multiNodePolicy in
MultiNodePolicySpec, FiCaSchedulerApp and AbstractCSQueue (#6490) Contributed
by Jiandan Yang.
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../scheduler/capacity/AbstractCSQueue.java | 12 ++++++------
.../resourcemanager/scheduler/capacity/CSQueue.java | 2 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 8 ++++----
.../scheduler/placement/MultiNodePolicySpec.java | 16 ++++++++--------
.../scheduler/placement/MultiNodeSorter.java | 4 ++--
.../scheduler/placement/MultiNodeSortingManager.java | 2 +-
6 files changed, 22 insertions(+), 22 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 1bdaebb3d89e..aaab713112be 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
@@ -98,7 +98,7 @@ public abstract class AbstractCSQueue implements CSQueue {
final ResourceCalculator resourceCalculator;
Set<String> resourceTypes;
final RMNodeLabelsManager labelManager;
- private String multiNodeSortingPolicyName = null;
+ private String multiNodeSortingPolicyClassName = null;
Map<AccessType, AccessControlList> acls =
new HashMap<AccessType, AccessControlList>();
@@ -423,7 +423,7 @@ public abstract class AbstractCSQueue implements CSQueue {
getQueuePathObject());
// Update multi-node sorting algorithm for scheduling as configured.
- setMultiNodeSortingPolicyName(
+ setMultiNodeSortingPolicyClassName(
configuration.getMultiNodesSortingAlgorithmPolicy(getQueuePathObject()));
// Setup application related limits
@@ -1197,12 +1197,12 @@ public abstract class AbstractCSQueue implements
CSQueue {
}
@Override
- public String getMultiNodeSortingPolicyName() {
- return this.multiNodeSortingPolicyName;
+ public String getMultiNodeSortingPolicyClassName() {
+ return this.multiNodeSortingPolicyClassName;
}
- public void setMultiNodeSortingPolicyName(String policyName) {
- this.multiNodeSortingPolicyName = policyName;
+ public void setMultiNodeSortingPolicyClassName(String policyName) {
+ this.multiNodeSortingPolicyClassName = policyName;
}
public long getMaximumApplicationLifetime() {
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/CSQueue.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/CSQueue.java
index 72f3cd16fe82..a5672a8bcdf0 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/CSQueue.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/CSQueue.java
@@ -529,7 +529,7 @@ public interface CSQueue extends SchedulerQueue<CSQueue> {
* Get Multi Node scheduling policy name.
* @return policy name
*/
- String getMultiNodeSortingPolicyName();
+ String getMultiNodeSortingPolicyClassName();
/**
* Get the maximum lifetime in seconds of an application which is submitted
to
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/common/fica/FiCaSchedulerApp.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index 3a0fd347e5a0..f050dc3ebc15 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -187,17 +187,17 @@ public class FiCaSchedulerApp extends
SchedulerApplicationAttempt {
return;
}
- String queueName = null;
+ String policyClassName = null;
if (scheduler instanceof CapacityScheduler) {
- queueName = getCSLeafQueue().getMultiNodeSortingPolicyName();
+ policyClassName = getCSLeafQueue().getMultiNodeSortingPolicyClassName();
}
if (!appSchedulingInfo.getApplicationSchedulingEnvs().containsKey(
ApplicationSchedulingConfig.ENV_MULTI_NODE_SORTING_POLICY_CLASS)
- && queueName != null) {
+ && policyClassName != null) {
appSchedulingInfo.getApplicationSchedulingEnvs().put(
ApplicationSchedulingConfig.ENV_MULTI_NODE_SORTING_POLICY_CLASS,
- queueName);
+ policyClassName);
}
}
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/placement/MultiNodePolicySpec.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodePolicySpec.java
index 8386d78c6d54..36fc3d42598a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodePolicySpec.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodePolicySpec.java
@@ -22,12 +22,12 @@ package
org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement;
*/
public class MultiNodePolicySpec {
- private String policyName;
+ private String policyClassName;
private long sortingInterval;
- public MultiNodePolicySpec(String policyName, long timeout) {
+ public MultiNodePolicySpec(String policyClassName, long timeout) {
this.setSortingInterval(timeout);
- this.setPolicyName(policyName);
+ this.setPolicyClassName(policyClassName);
}
public long getSortingInterval() {
@@ -38,18 +38,18 @@ public class MultiNodePolicySpec {
this.sortingInterval = timeout;
}
- public String getPolicyName() {
- return policyName;
+ public String getPolicyClassName() {
+ return policyClassName;
}
- public void setPolicyName(String policyName) {
- this.policyName = policyName;
+ public void setPolicyClassName(String policyClassName) {
+ this.policyClassName = policyClassName;
}
@Override
public String toString() {
return "MultiNodePolicySpec {" +
- "policyName='" + policyName + '\'' +
+ "policyClassName='" + policyClassName + '\'' +
", sortingInterval=" + sortingInterval +
'}';
}
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/placement/MultiNodeSorter.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
index ab05fec40a39..38af12719efa 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
@@ -74,9 +74,9 @@ public class MultiNodeSorter<N extends SchedulerNode> extends
AbstractService {
}
public void serviceInit(Configuration conf) throws Exception {
- LOG.info("Initializing MultiNodeSorter=" + policySpec.getPolicyName()
+ LOG.info("Initializing MultiNodeSorter=" + policySpec.getPolicyClassName()
+ ", with sorting interval=" + policySpec.getSortingInterval());
- initPolicy(policySpec.getPolicyName());
+ initPolicy(policySpec.getPolicyClassName());
super.serviceInit(conf);
}
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/placement/MultiNodeSortingManager.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
index 8c5691f189f6..fdcf7e715a51 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
@@ -89,7 +89,7 @@ public class MultiNodeSortingManager<N extends SchedulerNode>
MultiNodeSorter<N> mon = new MultiNodeSorter<N>(rmContext, policy);
mon.init(conf);
mon.start();
- runningMultiNodeSorters.put(policy.getPolicyName(), mon);
+ runningMultiNodeSorters.put(policy.getPolicyClassName(), mon);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
