Skip to content

YARN-11801: NPE in FifoCandidatesSelector.selectCandidates when preempting resources for an auto-created queue without child queues #7607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 28, 2025
Merged

YARN-11801: NPE in FifoCandidatesSelector.selectCandidates when preempting resources for an auto-created queue without child queues #7607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cff663f
YARN-11801: NPE in FifoCandidatesSelector.selectCandidates when preem…
susheelgupta7 Apr 11, 2025
c8777cc
similar changes as prev code
susheelgupta7 Apr 12, 2025
711051f
included auto created leaf queue
Apr 15, 2025
c548f0b
empty commit
Apr 16, 2025
327031d
used abstractleafqueue class for instance checking
Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...op/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AbstractParentQueue;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AbstractLeafQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
Expand All @@ -40,8 +41,6 @@
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;

import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity
.ManagedParentQueue;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueueCapacities;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.preemption.PreemptableQueue;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerPreemptEvent;
Expand Down Expand Up @@ -430,12 +429,14 @@ private void cleanupStaledPreemptionCandidates(long currentTime) {
}

private Set<String> getLeafQueueNames(TempQueuePerPartition q) {
// Also exclude ParentQueues, which might be without children
if (CollectionUtils.isEmpty(q.children)
&& !(q.parentQueue instanceof ManagedParentQueue)
&& (q.parentQueue == null
|| !q.parentQueue.isEligibleForAutoQueueCreation())) {
return ImmutableSet.of(q.queueName);
// Only consider this a leaf queue if:
// It is a concrete leaf queue (not a childless parent)
if (CollectionUtils.isEmpty(q.children)) {
CSQueue queue = scheduler.getQueue(q.queueName);
if (queue instanceof AbstractLeafQueue) {
return ImmutableSet.of(q.queueName);
}
return Collections.emptySet();
}

Set<String> leafQueueNames = new HashSet<>();
Expand Down
9 changes: 9 additions & 0 deletions ...org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractParentQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,15 @@ public boolean isEligibleForAutoQueueCreation() {
return isDynamicQueue() || queueContext.getConfiguration().
isAutoQueueCreationV2Enabled(getQueuePathObject());
}
/**
* Check whether this queue supports legacy(v1) dynamic child queue creation.
* @return true if queue is eligible to create child queues dynamically using
* the legacy system, false otherwise
*/
public boolean isEligibleForLegacyAutoQueueCreation() {
return isDynamicQueue() || queueContext.getConfiguration().
isAutoCreateChildQueueEnabled(getQueuePathObject());
}

@Override
public void reinitialize(CSQueue newlyParsedQueue,
Expand Down
94 changes: 64 additions & 30 deletions ...arn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,44 +1083,74 @@ public void testRefreshPreemptionProperties() throws Exception {
}

@Test
public void testLeafQueueNameExtraction() throws Exception {
ProportionalCapacityPreemptionPolicy policy =
buildPolicy(Q_DATA_FOR_IGNORE);
public void testLeafQueueNameExtractionWithFlexibleAQC() throws Exception {
ProportionalCapacityPreemptionPolicy policy = buildPolicy(Q_DATA_FOR_IGNORE);
ParentQueue root = (ParentQueue) mCS.getRootQueue();

root.addDynamicParentQueue("childlessFlexible");
ParentQueue dynamicParent = setupDynamicParentQueue("root.dynamicParent", true);
extendRootQueueWithMock(root, dynamicParent);

policy.editSchedule();
assertFalse(policy.getLeafQueueNames().contains( "root.dynamicParent"),
"root.dynamicLegacyParent" + " should not be a LeafQueue candidate");
}

@Test
public void testLeafQueueNameExtractionWithLegacyAQC() throws Exception {
ProportionalCapacityPreemptionPolicy policy = buildPolicy(Q_DATA_FOR_IGNORE);
ParentQueue root = (ParentQueue) mCS.getRootQueue();

root.addDynamicParentQueue("childlessLegacy");
ParentQueue dynamicParent = setupDynamicParentQueue("root.dynamicLegacyParent", false);
extendRootQueueWithMock(root, dynamicParent);

policy.editSchedule();
assertFalse(policy.getLeafQueueNames().contains( "root.dynamicLegacyParent"),
"root.dynamicLegacyParent" + " should not be a LeafQueue candidate");
}

private ParentQueue setupDynamicParentQueue(String queuePath, boolean isFlexible) {
ParentQueue dynamicParent = mockParentQueue(null, 0, new LinkedList<>());
mockQueueFields(dynamicParent, queuePath);

if (isFlexible) {
when(dynamicParent.isEligibleForAutoQueueCreation()).thenReturn(true);
} else {
when(dynamicParent.isEligibleForLegacyAutoQueueCreation()).thenReturn(true);
}

return dynamicParent;
}

private void extendRootQueueWithMock(ParentQueue root, ParentQueue mockQueue) {
List<CSQueue> queues = root.getChildQueues();
ArrayList<CSQueue> extendedQueues = new ArrayList<>();
LinkedList<ParentQueue> pqs = new LinkedList<>();
ParentQueue dynamicParent = mockParentQueue(
null, 0, pqs);
when(dynamicParent.getQueuePath()).thenReturn("root.dynamicParent");
when(dynamicParent.getQueueCapacities()).thenReturn(
new QueueCapacities(false));
QueueResourceQuotas dynamicParentQr = new QueueResourceQuotas();
dynamicParentQr.setEffectiveMaxResource(Resource.newInstance(1, 1));
dynamicParentQr.setEffectiveMinResource(Resources.createResource(1));
dynamicParentQr.setEffectiveMaxResource(RMNodeLabelsManager.NO_LABEL,
Resource.newInstance(1, 1));
dynamicParentQr.setEffectiveMinResource(RMNodeLabelsManager.NO_LABEL,
Resources.createResource(1));
when(dynamicParent.getQueueResourceQuotas()).thenReturn(dynamicParentQr);
when(dynamicParent.getEffectiveCapacity(RMNodeLabelsManager.NO_LABEL))
.thenReturn(Resources.createResource(1));
when(dynamicParent.getEffectiveMaxCapacity(RMNodeLabelsManager.NO_LABEL))
.thenReturn(Resource.newInstance(1, 1));
ResourceUsage resUsage = new ResourceUsage();
resUsage.setUsed(Resources.createResource(1024));
resUsage.setReserved(Resources.createResource(1024));
when(dynamicParent.getQueueResourceUsage()).thenReturn(resUsage);
when(dynamicParent.isEligibleForAutoQueueCreation()).thenReturn(true);
extendedQueues.add(dynamicParent);
extendedQueues.add(mockQueue);
extendedQueues.addAll(queues);
when(root.getChildQueues()).thenReturn(extendedQueues);
}

policy.editSchedule();
private void mockQueueFields(ParentQueue queue, String queuePath) {
when(queue.getQueuePath()).thenReturn(queuePath);
when(queue.getQueueCapacities()).thenReturn(new QueueCapacities(false));

QueueResourceQuotas qrq = new QueueResourceQuotas();
qrq.setEffectiveMaxResource(Resource.newInstance(1, 1));
qrq.setEffectiveMinResource(Resources.createResource(1));
qrq.setEffectiveMaxResource(RMNodeLabelsManager.NO_LABEL, Resource.newInstance(1, 1));
qrq.setEffectiveMinResource(RMNodeLabelsManager.NO_LABEL, Resources.createResource(1));

assertFalse(policy.getLeafQueueNames().contains("root.dynamicParent"),
"dynamicParent should not be a LeafQueue candidate");
when(queue.getQueueResourceQuotas()).thenReturn(qrq);
when(queue.getEffectiveCapacity(RMNodeLabelsManager.NO_LABEL))
.thenReturn(Resources.createResource(1));
when(queue.getEffectiveMaxCapacity(RMNodeLabelsManager.NO_LABEL))
.thenReturn(Resource.newInstance(1, 1));

ResourceUsage usage = new ResourceUsage();
usage.setUsed(Resources.createResource(1024));
usage.setReserved(Resources.createResource(1024));
when(queue.getQueueResourceUsage()).thenReturn(usage);
}

static class IsPreemptionRequestFor
Expand Down Expand Up @@ -1369,6 +1399,10 @@ LeafQueue mockLeafQueue(ParentQueue p, Resource tot, int i, Resource[] abs,
Resource[] used, Resource[] pending, Resource[] reserved, int[] apps,
Resource[] gran) {
LeafQueue lq = mock(LeafQueue.class);

String queuePath = p.getQueuePath() + ".queue" + (char)('A' + i - 1);
when(mCS.getQueue(queuePath)).thenReturn(lq);

ResourceCalculator rc = mCS.getResourceCalculator();
List<ApplicationAttemptId> appAttemptIdList =
new ArrayList<ApplicationAttemptId>();
Expand Down