YARN-11041. Resolved conflicts
Change-Id: I2bd30982c32386d68dc662dc268773e0d56be777
This commit is contained in:
parent
54fe2f486f
commit
5a6251dd57
|
@ -133,7 +133,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
|
|||
this.childQueues = new ArrayList<>();
|
||||
this.allowZeroCapacitySum =
|
||||
queueContext.getConfiguration()
|
||||
.getAllowZeroCapacitySum(getQueuePath());
|
||||
.getAllowZeroCapacitySum(getQueuePathObject());
|
||||
|
||||
}
|
||||
|
||||
|
@ -167,7 +167,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
|
|||
|
||||
// Initialize queue ordering policy
|
||||
queueOrderingPolicy = configuration.getQueueOrderingPolicy(
|
||||
getQueuePath(), parent == null ?
|
||||
getQueuePathObject(), parent == null ?
|
||||
null :
|
||||
((AbstractParentQueue) parent).getQueueOrderingPolicyConfigName());
|
||||
queueOrderingPolicy.setQueues(childQueues);
|
||||
|
@ -549,7 +549,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
|
|||
*/
|
||||
public boolean isEligibleForAutoQueueCreation() {
|
||||
return isDynamicQueue() || queueContext.getConfiguration().
|
||||
isAutoQueueCreationV2Enabled(getQueuePath());
|
||||
isAutoQueueCreationV2Enabled(getQueuePathObject());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1585,7 +1585,7 @@ public abstract class AbstractParentQueue extends AbstractCSQueue {
|
|||
public boolean isEligibleForAutoDeletion() {
|
||||
return isDynamicQueue() && getChildQueues().size() == 0 &&
|
||||
queueContext.getConfiguration().
|
||||
isAutoExpiredDeletionEnabled(this.getQueuePath());
|
||||
isAutoExpiredDeletionEnabled(this.getQueuePathObject());
|
||||
}
|
||||
|
||||
public AutoCreatedQueueTemplate getAutoCreatedQueueTemplate() {
|
||||
|
|
Loading…
Reference in New Issue