Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11041. Resolved conflicts 

Change-Id: I2bd30982c32386d68dc662dc268773e0d56be777
This commit is contained in:
Peter Szucs 2023-05-19 17:58:09 +02:00
parent 54fe2f486f
commit 5a6251dd57
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractParentQueue.java
View File

@ -133,7 +133,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
this.childQueues = new ArrayList<>(); this.childQueues = new ArrayList<>();
this.allowZeroCapacitySum = this.allowZeroCapacitySum =
queueContext.getConfiguration() queueContext.getConfiguration()
.getAllowZeroCapacitySum(getQueuePath()); .getAllowZeroCapacitySum(getQueuePathObject());
} }
@ -167,7 +167,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
// Initialize queue ordering policy // Initialize queue ordering policy
queueOrderingPolicy = configuration.getQueueOrderingPolicy( queueOrderingPolicy = configuration.getQueueOrderingPolicy(
getQueuePath(), parent == null ? getQueuePathObject(), parent == null ?
null : null :
((AbstractParentQueue) parent).getQueueOrderingPolicyConfigName()); ((AbstractParentQueue) parent).getQueueOrderingPolicyConfigName());
queueOrderingPolicy.setQueues(childQueues); queueOrderingPolicy.setQueues(childQueues);
@ -549,7 +549,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
*/ */
public boolean isEligibleForAutoQueueCreation() { public boolean isEligibleForAutoQueueCreation() {
return isDynamicQueue() || queueContext.getConfiguration(). return isDynamicQueue() || queueContext.getConfiguration().
isAutoQueueCreationV2Enabled(getQueuePath()); isAutoQueueCreationV2Enabled(getQueuePathObject());
} }
@Override @Override
@ -1585,7 +1585,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
public boolean isEligibleForAutoDeletion() { public boolean isEligibleForAutoDeletion() {
return isDynamicQueue() && getChildQueues().size() == 0 && return isDynamicQueue() && getChildQueues().size() == 0 &&
queueContext.getConfiguration(). queueContext.getConfiguration().
isAutoExpiredDeletionEnabled(this.getQueuePath()); isAutoExpiredDeletionEnabled(this.getQueuePathObject());
} }
public AutoCreatedQueueTemplate getAutoCreatedQueueTemplate() { public AutoCreatedQueueTemplate getAutoCreatedQueueTemplate() {